diff tests/test-pull-pull-corruption2 @ 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 d181845bdc51
children
line wrap: on
line diff