mergetools / gvimdiff2on commit Merge branch 'js/alias-case-sensitivity' (099b74b)
   1. "$MERGE_TOOLS_DIR/vimdiff"