From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jun 2010 18:16:54 +0000 (-0700)
Subject: Merge branch 'hg/id-munging'
X-Git-Tag: v1.7.2-rc0~59
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6c6f87842bcb8ac4d36922cec5b5ce25de14756e;p=git.git

Merge branch 'hg/id-munging'

* hg/id-munging:
  convert: Keep foreign $Id$ on checkout.
  convert: Safer handling of $Id$ contraction.
---

6c6f87842bcb8ac4d36922cec5b5ce25de14756e