Merge branch 'hg/id-munging'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:54 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:54 +0000 (11:16 -0700)
* hg/id-munging:
  convert: Keep foreign $Id$ on checkout.
  convert: Safer handling of $Id$ contraction.


Trivial merge