diff tests/test-merge1.out @ 2776:557ea210fd9f

Remove **opts arg from commands.doupdate
author Matt Mackall <mpm@selenic.com>
date Thu, 03 Aug 2006 20:06:05 -0500
parents b2ae81a7df29
children a31557193f3c
line wrap: on
line diff