mergetools / gvimdiff2on commit Merge branch 'nd/upload-pack-shallow' (1ddb4d7)
   1. "$MERGE_TOOLS_DIR/vimdiff"