From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Dec 2010 00:03:41 +0000 (-0800)
Subject: Merge git://git.bogomips.org/git-svn
X-Git-Tag: v1.7.4-rc0~70
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2f76a26ee707ab72c043148b38dfffb7a63ae516;p=git.git

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

2f76a26ee707ab72c043148b38dfffb7a63ae516