diff tests/test-bad-pull @ 3114:d1d1cd5b9484

merge: eliminate confusing queued variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 19:53:19 -0500
parents d22d730c96ed
children 7012c889e8f2
line wrap: on
line diff