merge-recursive: eliminate flush_buffer() in favor of write_in_full()