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)
* jc/diff:
  builtin-diff.c: die() formatting type fix.


Trivial merge