comparison tests/test-push-http.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 8051549afb32
children f53b9a383476
comparison
equal deleted inserted replaced
6007:090b1a665901 6008:33bfedc0be4a