diff tests/test-merge7.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 b16456909a0a
children 46280c004f22
line wrap: on
line diff