Mercurial > hg-stable

view tests/test-merge5.out @ 5260:be4835ad9a85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: new config variable hg.tagsbranch controls which branch tags are committed to
author Brendan Cully <brendan@kublai.com>
date Mon, 27 Aug 2007 15:39:07 -0700
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