From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Mar 2008 08:10:38 +0000 (-0700)
Subject: Merge branch 'db/diff-to-fp'
X-Git-Tag: v1.5.5-rc0~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f1e1257a176ce851ffb683bbba505ae22625ec9;p=git.git

Merge branch 'db/diff-to-fp'

* db/diff-to-fp:
  wt-status.c: no need for dup() dance anymore
  Write diff output to a file in struct diff_options
---

1f1e1257a176ce851ffb683bbba505ae22625ec9