Merge branch 'tr/merge-recursive-flush' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:31 +0000 (10:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:31 +0000 (10:53 -0700)
commit3f835949e9b800619136f2511e84000c95916d6e
treead9e0ab3ac73e205037d274afff6b2c8e1acb46c
parentd8ce800531d0c5c26cdc076fe2b9e70d25fe7f81
parentf633ea2c736a2a38e92fcf61e90c8adadc5c504d
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()
merge-recursive.c