diff hgmerge @ 4687:06a0e0557edc

convert: sometimes git forgets the author
author Matt Mackall <mpm@selenic.com>
date Sat, 23 Jun 2007 13:33:45 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff