diff tests/test-merge9.out @ 4687:06a0e0557edc

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