On 02/02/17 18:27, Andrew Haley wrote: > It might be a problem with the way I'm working with git. I've been > trying to merge updates into my working branch but something always > seems to go wrong. Scratch that: I just did a new merge from master and the failure is still there. I'm baffled. Andrew.