diff tests/test-conflict.out @ 6671:938eddd76237

tag: record tag we're superseding, if any (issue 1102)
author Matt Mackall <mpm@selenic.com>
date Fri, 13 Jun 2008 17:29:10 -0500
parents 92ccccb55ba3
children 9fe7e6acf525
line wrap: on
line diff