mergetools / gvimdiff2on commit Merge branch 'ab/doc-hash-brokenness' into next (e9b2f5c)
   1. "$MERGE_TOOLS_DIR/vimdiff"