diff tests/test-trusted.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 543597fae51d
children 95b0d4c1c9e1
line wrap: on
line diff