diff tests/test-convert-baz @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 6e4cf8319f54
children 7fc79055a62b
line wrap: on
line diff