diff tests/test-trusted.py @ 6008:33bfedc0be4a

filemerge: add an example set of global settings for common merge tools
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Feb 2008 19:29:05 -0600
parents 5db730475d6d
children 6b5522cb2ad2
line wrap: on
line diff