mergetools / gvimdiff3on commit Merge branch 'ek/alt-odb-entry-fix' (a8c565b)
   1. "$MERGE_TOOLS_DIR/vimdiff"