diff tests/test-hg-parseurl.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 3d6915f5a2bb
children 375872fdadba
line wrap: on
line diff