mergetools / gvimdiff2on commit Merge branch 'mk/upload-pack-off-by-one-dead-code-removal' (4c72ee8)
   1. "$MERGE_TOOLS_DIR/vimdiff"