Code

Merge branch 'lt/unitype'
authorJunio C Hamano <junkio@cox.net>
Fri, 14 Jul 2006 22:39:19 +0000 (15:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 14 Jul 2006 22:39:19 +0000 (15:39 -0700)
* lt/unitype:
  builtin-prune.c: forgot TYPE => OBJ changes.
  Remove TYPE_* constant macros and use object_type enums consistently.

1  2 
commit.c
upload-pack.c

diff --cc commit.c
Simple merge
diff --cc upload-pack.c
Simple merge