diff tests/test-subrepo-recursion.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 6cc4b14fb76b
children aae2d5cbde64 22167be007ed
line wrap: on
line diff