mergetools / gvimdiff2on commit Merge branch 'rs/check-ignore-multi' (796a788)
   1. "$MERGE_TOOLS_DIR/vimdiff"