mergetools / vimdiff2on commit Merge branch 'mm/describe-doc' (15b3f71)
   1. "$MERGE_TOOLS_DIR/vimdiff"