From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Sep 2010 00:29:40 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ac8cf5bc17ef11a9c5d51ab128ad010cb37c464?ds=inline;hp=--cc

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
---

8ac8cf5bc17ef11a9c5d51ab128ad010cb37c464