diff tests/test-merge-local.out @ 10592:1875dc1ac5f4 stable

Added tag 1.5 for changeset ff2704a8ded3
author Matt Mackall <mpm@selenic.com>
date Fri, 05 Mar 2010 18:26:12 -0600
parents a964ab624385
children 6f1894d6a6b0
line wrap: on
line diff