Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 00:29:40 +0000 (17:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2010 00:29:40 +0000 (17:29 -0700)
commit8ac8cf5bc17ef11a9c5d51ab128ad010cb37c464
tree7412604a665890a9ce4dbeaac0cca3406f2ba7ca
parentbff42061214e17f342efc909c73f29bf66df51e9
parent1b6ecbad3511b1aaa65172ef8b520dd3b5141614
Merge branch 'maint'

* maint:
  xdiff-interface.c: always trim trailing space from xfuncname matches
  diff.c: call regfree to free memory allocated by regcomp when necessary
diff.c