diff CONTRIBUTORS @ 3299:e7abcf3a7c5f

filemerge: use contexts rather than my and other
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:27:04 -0500
parents 2d865068f72e
children c29efd272395
line wrap: on
line diff