comparison tests/fish-merge @ 3442:798bcde0c9c2

merge: fix branch setting (and remove debugging message)
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:59:01 -0500
parents 0902ffece4b4
children
comparison
equal deleted inserted replaced
3441:ef2e990f9047 3442:798bcde0c9c2