comparison tests/test-excessive-merge.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 b2ae81a7df29
children 8feb33c2d153
comparison
equal deleted inserted replaced
2896:834e147842d7 2897:dd032b0f02ac