diff tests/test-merge6.out @ 2908:3848488244fc

Move ui.diffopts to patch.diffopts where it belongs
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 11:34:08 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff