diff tests/test-git-import.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 b70740aefa4d
children 1c9b6f1237e0
line wrap: on
line diff