diff tests/test-1102.t @ 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 1eb77c1a281f
children 1c1ca9d393f4
line wrap: on
line diff