Code

Merge branch 'as/userdiff-pascal' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Jan 2011 18:57:17 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Jan 2011 18:57:17 +0000 (10:57 -0800)
* as/userdiff-pascal:
  userdiff: match Pascal class methods

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge