Merge branch 'hg/id-munging'
commit6c6f87842bcb8ac4d36922cec5b5ce25de14756e
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:54 +0000 (18 11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:54 +0000 (18 11:16 -0700)
treea846522ebad998f36a8d5a27a7301fc72825efc9
parent8642abc76454a6e09344e27a7797ff08264abe76
parent07814d90095b65b4594efd47c69f9f171ef162d4
Merge branch 'hg/id-munging'

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