In Java-land, especially when running on Windows, executed processes will halt

if the buffer for their stdout or stderr streams fills up. This meant that

diffs of sufficient size would hang forever. This change moves some things

around such that we read both streams fully before waiting for the process to

quit.

Checked that the "diff" command still worked correctly and produced a diff.