From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 17:53:31 +0000 (-0700)
Subject: Merge branch 'tr/merge-recursive-flush' into maint-1.7.11
X-Git-Tag: v1.7.11.6~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f835949e9b800619136f2511e84000c95916d6e;p=git.git

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()
---

3f835949e9b800619136f2511e84000c95916d6e