Merge branch 'jc/xsha1-2'
commit746437d534a1fa84e210427a94972ed0c7f34ee5
authorJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 05:55:40 +0000 (1 22:55 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 05:55:40 +0000 (1 22:55 -0700)
tree3ed4776ac36702873cc1299e066ed2f447d2d1f9
parentcbd800ba7901dc89ce00930334eebf2b6b84cefb
parentea4a19e172e8db52779c06723b1e99cc12f228c9
Merge branch 'jc/xsha1-2'

* jc/xsha1-2:
  Extended SHA1 -- "rev^@" syntax to mean "all parents"
revision.c