Merge branch 'jc/xsha1-2' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 1 May 2006 08:54:27 +0000 (01:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 1 May 2006 08:54:27 +0000 (01:54 -0700)
* jc/xsha1-2:
  Extended SHA1 -- "rev^@" syntax to mean "all parents"

1  2 
revision.c

diff --cc revision.c
Simple merge