mergetools / gvimdiff3on commit Merge branch 'rs/fix-alt-odb-path-comparison' (b41a463)
   1. "$MERGE_TOOLS_DIR/vimdiff"