mergetools / vimdiff3on commit treewide: correct several "up-to-date" to "up to date" (7560f54)
   1. "$MERGE_TOOLS_DIR/vimdiff"