view tests/test-mq-qsave.out @ 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 ff3edd1c1e27
children
line wrap: on
line source

adding base
restoring status: hg patches saved state