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)
* maint:
  xdiff-interface.c: always trim trailing space from xfuncname matches
  diff.c: call regfree to free memory allocated by regcomp when necessary

1  2 
diff.c

diff --cc diff.c
Simple merge