mergetools / vimdiff2on commit Merge branch 'js/config-set-in-non-repository' (d3faba8)
   1. "$MERGE_TOOLS_DIR/vimdiff"