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)
commit1f1e1257a176ce851ffb683bbba505ae22625ec9
tree856ee0a40a971d8c41d7ec16fd653f741e7df4a3
parent50c2b54b23e0d7df40bd8739c1c96df42c47f280
parent4ba0cb27c1c0c3aa65d28e1891c1f3dca3db5f93
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