comparison doc/hgmerge.1.txt @ 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 63b9d2deed48
children
comparison
equal deleted inserted replaced
6007:090b1a665901 6008:33bfedc0be4a