diff tests/test-excessive-merge.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 4c94b6d0fb1c
children ec5886db9dc6
line wrap: on
line diff