diff tests/test-merge8.out @ 3620:3109f012c305

Clarify untracked file merge message
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Nov 2006 21:47:55 -0600
parents efbe24c7d8d9
children 9103dab96093
line wrap: on
line diff