view tests/test-merge5.out @ 6067:57c1a7052982

Option to log to only show changesets within a specified branch.
author Dustin Sallings <dustin@spy.net>
date Fri, 08 Feb 2008 21:31:03 -0800
parents fffc8a733bf9
children 4b0c9c674707
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