Merge "Clarify warnings about missing software diff3 and git."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 13 Jan 2019 01:48:47 +0000 (01:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 13 Jan 2019 01:48:47 +0000 (01:48 +0000)

Trivial merge