Merge branch 'as/userdiff-pascal' into next
commit90603894a18067a41fb6f2bfd34424c84cd61007
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Jan 2011 18:57:17 +0000 (18 10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Jan 2011 18:57:17 +0000 (18 10:57 -0800)
tree5ed178a9bf37341a72aef35b6407c92452430f1c
parentf3988f86f5368178f7bfc023cb75c0f3524745ba
parentad5b6942d5b9127cc940d2135ce82c633013418a
Merge branch 'as/userdiff-pascal' into next

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