diff tests/test-merge4.t @ 19647:3d2e07c863d4 stable

Added tag 2.7.1 for changeset 335a558f81dc
author Matt Mackall <mpm@selenic.com>
date Tue, 03 Sep 2013 18:05:06 -0500
parents 63c817ea4a70
children 8561ad49915d
line wrap: on
line diff