Merge branch 'jc/xsha1-2'
authorJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 05:55:40 +0000 (22:55 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 05:55:40 +0000 (22:55 -0700)
* jc/xsha1-2:
  Extended SHA1 -- "rev^@" syntax to mean "all parents"

1  2 
revision.c

diff --cc revision.c
Simple merge