diff tests/test-pull-branch.t @ 12294:f2f6d838064a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 14 Sep 2010 16:21:21 -0500
parents 28e2e3804f2e
children e380964d53f8
line wrap: on
line diff