view tests/test-merge4.out @ 3524:ba94e80e5540

Remove update -m, deprecated for 0.9.1
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Oct 2006 18:29:54 -0500
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)