Merge branch 'tr/merge-recursive-flush'

Remove unnecessary code.

* tr/merge-recursive-flush:
  merge-recursive: eliminate flush_buffer() in favor of write_in_full()

diff --cc merge-recursive.c
index 39b2e165e05472daf38cd6f458541b6db4abc9a8,eed936ebec2a83fa87d67e9c25093546fe77bb57..3b24d930e2cd9e282e18b552b8b0be3f404c2e99
--- 1/merge-recursive.c
--- 2/merge-recursive.c
+++ b/merge-recursive.c
@@@ -788,8 -770,8 +771,8 @@@ static void update_file_flags(struct me
                                mode = 0666;
                        fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
                        if (fd < 0)
 -                              die_errno("failed to open '%s'", path);
 +                              die_errno(_("failed to open '%s'"), path);
-                       flush_buffer(fd, buf, size);
+                       write_in_full(fd, buf, size);
                        close(fd);
                } else if (S_ISLNK(mode)) {
                        char *lnk = xmemdupz(buf, size);