diff tests/test-bad-extension.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 01454af644b8
children 96e21337dc03
line wrap: on
line diff