comparison Makefile @ 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 c51fad25e59e
children 2ab464771b7d 1a7794525c2b
comparison
equal deleted inserted replaced
3298:45f0c49f0449 3299:e7abcf3a7c5f