diff hgext/parentrevspec.py @ 12154:c85e07a2d783

test-merge5: ensure updating to tip across branches is tested When doing "hg update" across branches (without any revision specified), hg will abort and ask the user to merge or do hg update -c. This tests for that error.
author Brodie Rao <brodie@bitheap.org>
date Thu, 02 Sep 2010 12:48:46 -0400
parents 08a0f04b56bd
children
line wrap: on
line diff