![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Sep 2010 00:29:40 +0000 (17:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Sep 2010 00:29:40 +0000 (17:29 -0700) | ||
| commit | 8ac8cf5bc17ef11a9c5d51ab128ad010cb37c464 | |
| tree | 7412604a665890a9ce4dbeaac0cca3406f2ba7ca | tree | snapshot |
| parent | bff42061214e17f342efc909c73f29bf66df51e9 | commit | diff |
| parent | 1b6ecbad3511b1aaa65172ef8b520dd3b5141614 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |