diff hgmerge @ 3620:3109f012c305

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