diff tests/test-clone.out @ 3305: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 b2ae81a7df29
children aaeb7f5d1052
line wrap: on
line diff