diff tests/test-bundle-r.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 d89e98840b08
children a225055b3b59
line wrap: on
line diff