mergetools / gvimdiffon commit Merge branch 'jk/alt-odb-cleanup' (0538b84)
   1. "$MERGE_TOOLS_DIR/vimdiff"