tree b395d88b99a5b88ea8d5c7863aaf16a22a50f5df
parent 0efbb7d9f488112d20a8ff257b72a3699aae8ef8
parent ad5b6942d5b9127cc940d2135ce82c633013418a
author Junio C Hamano <gitster@pobox.com> 1295895252 -0800
committer Junio C Hamano <gitster@pobox.com> 1295895252 -0800

Merge branch 'as/userdiff-pascal'

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