view tests/test-merge3.out @ 3620:3109f012c305

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

removing b
nothing changed