mergetools / gvimdiff2on commit Merge branch 'rs/archive-zip-raw-compression' (f4e89b9)
   1. "$MERGE_TOOLS_DIR/vimdiff"