Merge branch 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 30 Apr 2006 08:01:24 +0000 (01:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 30 Apr 2006 08:01:24 +0000 (01:01 -0700)
commit88a3d24831e7c387db198d54c5e1ad1771f60f61
tree0831eba36aa31cea85046f57c7160d62155cbc7d
parent6b401891a212950762e8673eaaebe4b6e6c79c0c
parent334b506a3487f762493d3db2d3053114f25590e3
Merge branch 'jc/diff' into next

* jc/diff:
  builtin-diff.c: die() formatting type fix.