diff tests/test-simplemerge.py @ 4687:06a0e0557edc

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