mergetools / vimdiff3on commit config: allow for platform-specific core.* config settings (70fc579)
   1. "$MERGE_TOOLS_DIR/vimdiff"