Merge branch 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 06:09:15 +0000 (23:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 06:09:15 +0000 (23:09 -0700)
commit200f5dffc257f99f99597d1a8127e1d79ff3c176
tree8ac19f5ce51536a2bd19c2fbb010ccd3757f035c
parentf5196dbb25febb15b41ef0e6569aaa1654b8533e
parent8ab99476ec2298a43e94949e0bb7aa5125793a28
Merge branch 'jc/diff' into next

* jc/diff:
  builtin-diff: call it "git-diff", really.
Makefile
git.c