Skip to content

Instantly share code, notes, and snippets.

@SaintSkeeta
Last active April 13, 2020 17:41
Show Gist options
  • Star 2 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save SaintSkeeta/051f119717b0f0f9bb1b770faf134879 to your computer and use it in GitHub Desktop.
Save SaintSkeeta/051f119717b0f0f9bb1b770faf134879 to your computer and use it in GitHub Desktop.
<?xml version="1.0" encoding="utf-8" ?>
<MergeToolChooserConfig>
<!-- Params are sent from %USERPROFILE%\.gitconfig
Typically (as shown in http://hedgehogdevelopment.github.io/tds/chapter4.html#configuring-sitecore-item-merge-for-git-using-mergechooser) they are
\"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
which map to parameters $1, $2, $3, and $4 respectively.
But additional labels (for the window panes in the merge tools) may also be passed like
\"Local\" \"Remote\" \"Original then Merged Result (when selection is resolved)\"
which would map to parameters $5, $6 and $7 respectively -->
<!-- TDS Sitecore Item Merge Tool -->
<MergeTool Extension=".item" Cmd=".\SitecoreItemMerge.exe" Parameters="&quot;$1&quot; &quot;$2&quot; &quot;$3&quot; &quot;$4&quot; &quot;$5&quot; &quot;$6&quot; &quot;$7&quot;"/>
<!-- VS Code -->
<MergeTool Extension=".cs" Cmd="C:\Program Files\Microsoft VS Code\Code.exe" Parameters="-n --wait &quot;$4&quot;" />
<!-- Visual Studio Diff Merge
https://stackoverflow.com/questions/23018528/what-are-the-command-line-arguments-for-tfs-default-merge-tool-for-vs-2012 -->
<!-- VS 2015 -->
<!-- <MergeTool Extension=".csproj" Cmd="C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\vsdiffmerge.exe" Parameters="&quot;$1&quot; &quot;$2&quot; &quot;$3&quot; &quot;$4&quot; /t /m" />-->
<!-- VS 2017 -->
<MergeTool Extension=".csproj" Cmd="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe" Parameters="&quot;$2&quot; &quot;$3&quot; &quot;$1&quot; &quot;$4&quot; /t /m" />
<MergeTool Extension=".scproj" Cmd="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe" Parameters="&quot;$2&quot; &quot;$3&quot; &quot;$1&quot; &quot;$4&quot; /t /m" />
<!-- Tortoise Merge -->
<MergeTool Extension=".json" Cmd="C:\Program Files (x86)\Tortoise\TortoiseMerge.exe" Parameters=" &quot;$3&quot; &quot;$1&quot; &quot;$2&quot; /merged &quot;$4&quot; /minename=&quot;$5&quot; /theirsname=&quot;$6&quot; /mergedname=&quot;$7&quot;" />
<!-- WinMerge -->
<MergeTool Extension=".cshtml" Cmd="C:\Program Files (x86)\WinMerge\WinMergeU.exe" Parameters="-e -u &quot;$2&quot; &quot;$3&quot; &quot;$4&quot; -dl &quot;$5&quot; -dr &quot;$6&quot;" />
<!-- Beyond Compare -->
<MergeTool Extension=".css" Cmd="C:\Program Files (x86)\Beyond Compare 3\BCompare.exe" Parameters="&quot;$1&quot; &quot;$2&quot; &quot;$3&quot; &quot;$4&quot; /lefttitle=&quot;$5&quot; /righttitle=&quot;$6&quot; /centertitle=&quot;$7&quot;" />
<!-- Default entry -->
<MergeTool Cmd="C:\Program Files\KDiff3\KDiff3.exe" Parameters="&quot;$1&quot; &quot;$2&quot; &quot;$3&quot; -o &quot;$4&quot; --L1 &quot;Base File (Original)&quot; --L2 &quot;$5&quot; --L3 &quot;$6&quot;"/>
</MergeToolChooserConfig>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment