diff tests/test-merge-revert.out @ 4398:3b7e284b8f28

merge: expand and simplify the invalid handling for directory moves
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:24:43 -0500
parents d2b55e3c4e25
children
line wrap: on
line diff