![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jun 2010 16:35:36 +0000 (09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jun 2010 16:35:36 +0000 (09:35 -0700) | ||
| commit | 262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 | |
| tree | 1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 | tree | snapshot |
| parent | 6df2ffaeef3f593214e88d9c148a7f3504f13e5e | commit | diff |
| parent | a4c24549acf16f7917ea3ddd811c6c61afc5689c | commit | diff |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.1.1
tests: remove unnecessary '^' from 'expr' regular expression
Conflicts:
diff.c
* maint:
Update draft release notes to 1.7.1.1
tests: remove unnecessary '^' from 'expr' regular expression
Conflicts:
diff.c
| diff.c | diff1 | | diff2 | | blob | history |
| t/t7005-editor.sh | diff1 | | diff2 | | blob | history |
| t/t7006-pager.sh | diff1 | | diff2 | | blob | history |