diff tests/test-merge5.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 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line diff