mergetools / gvimdiff2on commit tag doc: split up the --[no-]merged documentation (b084060)
   1. "$MERGE_TOOLS_DIR/vimdiff"