Merge "Clarify warnings about missing software diff3 and git."