Last active
April 13, 2020 17:41
-
-
Save SaintSkeeta/051f119717b0f0f9bb1b770faf134879 to your computer and use it in GitHub Desktop.
This file 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.
Learn more about bidirectional Unicode characters
<?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=""$1" "$2" "$3" "$4" "$5" "$6" "$7""/> | |
<!-- VS Code --> | |
<MergeTool Extension=".cs" Cmd="C:\Program Files\Microsoft VS Code\Code.exe" Parameters="-n --wait "$4"" /> | |
<!-- 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=""$1" "$2" "$3" "$4" /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=""$2" "$3" "$1" "$4" /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=""$2" "$3" "$1" "$4" /t /m" /> | |
<!-- Tortoise Merge --> | |
<MergeTool Extension=".json" Cmd="C:\Program Files (x86)\Tortoise\TortoiseMerge.exe" Parameters=" "$3" "$1" "$2" /merged "$4" /minename="$5" /theirsname="$6" /mergedname="$7"" /> | |
<!-- WinMerge --> | |
<MergeTool Extension=".cshtml" Cmd="C:\Program Files (x86)\WinMerge\WinMergeU.exe" Parameters="-e -u "$2" "$3" "$4" -dl "$5" -dr "$6"" /> | |
<!-- Beyond Compare --> | |
<MergeTool Extension=".css" Cmd="C:\Program Files (x86)\Beyond Compare 3\BCompare.exe" Parameters=""$1" "$2" "$3" "$4" /lefttitle="$5" /righttitle="$6" /centertitle="$7"" /> | |
<!-- Default entry --> | |
<MergeTool Cmd="C:\Program Files\KDiff3\KDiff3.exe" Parameters=""$1" "$2" "$3" -o "$4" --L1 "Base File (Original)" --L2 "$5" --L3 "$6""/> | |
</MergeToolChooserConfig> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment