mergetools / vimdiff2on commit git svn: consistent spacing after "W:" in warnings (eae6cf5)
   1. "$MERGE_TOOLS_DIR/vimdiff"