Merge branch 'as/userdiff-pascal'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 18:54:12 +0000 (10:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 18:54:12 +0000 (10:54 -0800)
* as/userdiff-pascal:
  userdiff: match Pascal class methods

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge