comparison tests/test-merge1.out @ 6769:97c12b1ed1e0

status: use contexts
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Jul 2008 18:46:02 -0500
parents 4b0c9c674707
children 50b6af595e0c
comparison
equal deleted inserted replaced
6768:e3bb005373b1 6769:97c12b1ed1e0