comparison tests/test-merge7.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 49988d9f0758
children 92a0c2200e41
comparison
equal deleted inserted replaced
2900:05257fd28591 2908:3848488244fc