Merge branch 'jc/diff'
authorJunio C Hamano <junkio@cox.net>
Thu, 4 May 2006 06:54:34 +0000 (23:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 4 May 2006 06:54:34 +0000 (23:54 -0700)
commit230f544e877641666f8c3718ac4563294c2b305e
treeae2c574c6c8384b7b379aff52c035a7b953ff084
parent6b16250a4551682b026b2592e44077ffa5fbdf2a
parent8ab99476ec2298a43e94949e0bb7aa5125793a28
Merge branch 'jc/diff'

* jc/diff:
  builtin-diff: call it "git-diff", really.
  builtin-diff.c: die() formatting type fix.
  built-in diff: assorted updates.
  built-in diff.
Makefile
builtin-diff.c
builtin.h
git.c
revision.c