diff tests/test-inherit-mode.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 bb69460e9d2d
children 4c4aeaab2339
line wrap: on
line diff