Merge branch 'lt/prune'
authorJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:55 +0000 (22:31 -0700)
* lt/prune:
  builtin "git prune"

1  2 
Makefile
git.c

diff --cc Makefile
Simple merge
diff --cc git.c
Simple merge