automerge: 30e4ba6 * commit '30e4ba61bd8be252ce1f1ab72b5875cbbaa75305': Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO
30e4ba6