diff tests/test-dirstate.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 4fee1fd3de9a
children 9910f60a37ee
line wrap: on
line diff