| commit | 3f835949e9b800619136f2511e84000c95916d6e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Sep 2012 17:53:31 +0000 (11 10:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Sep 2012 17:53:31 +0000 (11 10:53 -0700) | ||
| tree | ad9e0ab3ac73e205037d274afff6b2c8e1acb46c | treesnapshot (tar.gz zip) |
| parent | d8ce800531d0c5c26cdc076fe2b9e70d25fe7f81 | commitdiff |
| parent | f633ea2c736a2a38e92fcf61e90c8adadc5c504d | commitdiff |
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()
* tr/merge-recursive-flush:
merge-recursive: eliminate flush_buffer() in favor of write_in_full()
| merge-recursive.c | diff1 | diff2 | blobhistory |