Merge branch 'maint'
commit2de00bf9e8815970c61cefaef35efeacd8a7d6de
authorJunio C Hamano <junkio@cox.net>
Thu, 19 Apr 2007 02:33:38 +0000 (18 19:33 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 19 Apr 2007 02:33:38 +0000 (18 19:33 -0700)
tree3a9f5d3948d4716c12efaadfeef4c5de10a9dec6
parent6fb8e8f401a065bdffe379764871551e37a041a0
parent6e6db39afc305e1205a4d2dcf34680bfa80bfc24
Merge branch 'maint'

* maint:
  fix up strtoul_ui error handling
  git-tar-tree: complete deprecation conversion message
builtin-update-index.c