mergetools / vimdiff2on commit Merge branch 'cc/test-oidmap' (c62bff2)
   1. "$MERGE_TOOLS_DIR/vimdiff"