diff tests/test-minirst.py.out @ 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 75f044d4dbf5
children 5082e2f3f8e0
line wrap: on
line diff