view tests/test-merge3.out @ 6277:cfebb175704f

copies: deal with symmetric difference for linear relationships choose the minimum of symmetric difference and the two revs in question
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Mar 2008 16:25:27 -0500
parents 91c56c427171
children
line wrap: on
line source

removing b
nothing changed