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)
commit342953a6860915b4b66dfb24147c46a191342daf
treeb395d88b99a5b88ea8d5c7863aaf16a22a50f5df
parent0efbb7d9f488112d20a8ff257b72a3699aae8ef8
parentad5b6942d5b9127cc940d2135ce82c633013418a
Merge branch 'as/userdiff-pascal'

* as/userdiff-pascal:
  userdiff: match Pascal class methods
userdiff.c