diff tests/test-unrelated-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 ced2d3620f95
children 8c4fd0de5de8
line wrap: on
line diff