comparison tests/test-backout.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 2ace3bf43089
children e8ee8fdeddb1
comparison
equal deleted inserted replaced
3304:45f0c49f0449 3305:e7abcf3a7c5f