Mercurial > hg
view tests/test-merge5.out @ 4213:3be4785f8994
tags: add --remove
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 14 Mar 2007 19:13:04 -0500 |
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