diff tests/test-push-warn @ 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 e506c14382fd
children 975c2469c316
line wrap: on
line diff