diff tests/test-doctest.py @ 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 0f83a402faa0
children 7cc4263e07a9 5d0a30fad7de
line wrap: on
line diff