| commit | 2f76a26ee707ab72c043148b38dfffb7a63ae516 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Dec 2010 00:03:41 +0000 (9 16:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Dec 2010 00:03:41 +0000 (9 16:03 -0800) | ||
| tree | 072dfb27fcb917d67626a9652ac474a35550f084 | treesnapshot (tar.gz zip) |
| parent | ed94cc768c0341f2e033901bb14f6030780a201e | commitdiff |
| parent | 7d79cb6ad5ef3061c8b5b25ff3f2d779b02ec472 | commitdiff |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
t9143: do not fail when unhandled.log.gz is not created
git-svn: allow the mergeinfo property to be set
* git://git.bogomips.org/git-svn:
t9143: do not fail when unhandled.log.gz is not created
git-svn: allow the mergeinfo property to be set