diff tests/test-clone-failure.out @ 3118:7a635ef25132

merge: simplify tests for local changed/remote deleted
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:18:27 -0500
parents 30c7564f6dfc
children aaeb7f5d1052
line wrap: on
line diff