view tests/test-merge5.out @ 4671:150afe6becf6

identify: take a path to a remote repo Rather than using -R, we take a path as an argument. This lets us use url#branch syntaxes that may be in hgrc.
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 13:09:01 -0500
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes