Merge branch 'tr/merge-recursive-flush'
commit8d35c114579fd870feb61f3746e1371634fd2163
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:52:19 +0000 (22 11:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:52:19 +0000 (22 11:52 -0700)
tree8b48c97128b7ecdc8236b70b6f6acd7688a1c10b
parent64336ebe3413e07dcf9e0bcaba93884caab8d65d
parentf633ea2c736a2a38e92fcf61e90c8adadc5c504d
Merge branch 'tr/merge-recursive-flush'

Remove unnecessary code.

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