mergetools / gvimdiffon commit Merge branch 'jk/oidhash' (a7db4c1)
   1. "$MERGE_TOOLS_DIR/vimdiff"