<p dir="auto">Test plan item for <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="134100502" data-permission-text="Title is private" data-url="https://github.com/microsoft/vscode/issues/3062" data-hovercard-type="issue" data-hovercard-url="/microsoft/vscode/issues/3062/hovercard" href="https://github.com/microsoft/vscode/issues/3062">#3062</a></p>
<p dir="auto"><a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/bpasero/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/bpasero">@bpasero</a> Please complete...</p>
<p dir="auto">1.0.0 introduced the ability to use VS Code as a git difftool. The relevant global <code class="notranslate">.gitconfig</code> lines are as follows:</p>
<div class="snippet-clipboard-content notranslate position-relative overflow-auto" data-snippet-clipboard-copy-content="[diff]
    tool = default-difftool
[difftool &quot;default-difftool&quot;]
    cmd = code --wait --diff $LOCAL $REMOTE"><pre class="notranslate"><code class="notranslate">[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE
</code></pre></div>
<p dir="auto">How can I use VS Code as a git <a href="https://www.git-scm.com/docs/git-mergetool" rel="nofollow">mergetool</a>?</p>
<p dir="auto">The relevant arguments it needs to accept, I believe, are <code class="notranslate">$LOCAL</code>, <code class="notranslate">$REMOTE</code>, <code class="notranslate">$BASE</code>, and <code class="notranslate">$MERGED</code>.</p>