Skip to content

Instantly share code, notes, and snippets.

<?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 -->