mergetools / gvimdiff2on commit Merge branch 'rs/empty-archive' (843fb91)
   1. "$MERGE_TOOLS_DIR/vimdiff"