diff tests/test-merge-default.out @ 8406:6ad1f72bdf34

context: add p1 and p2 methods
author Matt Mackall <mpm@selenic.com>
date Thu, 14 May 2009 13:20:40 -0500
parents 50b6af595e0c
children d8143769e1d4
line wrap: on
line diff