mergetools / vimdiff2on commit Merge branch 'js/reset-usage' (ad0e959)
   1. "$MERGE_TOOLS_DIR/vimdiff"