summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 11:52:19 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-22 11:52:19 -0700
commit8d35c114579fd870feb61f3746e1371634fd2163 (patch)
tree8b48c97128b7ecdc8236b70b6f6acd7688a1c10b /diff.h
parent64336ebe3413e07dcf9e0bcaba93884caab8d65d (diff)
parentf633ea2c736a2a38e92fcf61e90c8adadc5c504d (diff)
downloadgit-8d35c114579fd870feb61f3746e1371634fd2163.tar.gz
Merge branch 'tr/merge-recursive-flush'
Remove unnecessary code. * tr/merge-recursive-flush: merge-recursive: eliminate flush_buffer() in favor of write_in_full()
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions