diff tests/test-pull.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 9d1c3529ebbc
children 2d545b98a7bc
line wrap: on
line diff