diff tests/test-bad-pull.out @ 2897:dd032b0f02ac

merge: move forgets to the apply stage
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 18:30:21 -0500
parents 5eb02f9ed804
children 490e40816cbd
line wrap: on
line diff