Merge branch 'tr/merge-recursive-flush' into maint-1.7.11

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

Junio C Hamano committed Sep 11, 2012 at 10:53 UTC 3f835949e9b800619136f2511e84000c95916d6e

No changes.