Merge branch 'db/diff-to-fp'
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Mar 2008 08:10:38 +0000 (01:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Mar 2008 08:10:38 +0000 (01:10 -0700)
* db/diff-to-fp:
  wt-status.c: no need for dup() dance anymore
  Write diff output to a file in struct diff_options


Trivial merge