diff tests/test-merge1.out @ 3237:931288cf58a7

contexts: use __getattr__ rather than try/except in changectx
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Oct 2006 15:17:59 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff