mergetools / vimdiff3on commit Merge branch 'jt/oidmap' (54bd705)
   1. "$MERGE_TOOLS_DIR/vimdiff"