mergetools / vimdiff2on commit Merge branch 'sg/test-x' into next (ab0684b)
   1. "$MERGE_TOOLS_DIR/vimdiff"