Mercurial > hg
view tests/test-rebase-mq-skip.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | 808f03f61ebe |
children | 7b19cda0fa10 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved % "Mainstream" import p1.patch 1 files updated, 0 files merged, 2 files removed, 0 files unresolved applying p1.patch % Rebase 1 files updated, 0 files merged, 1 files removed, 0 files unresolved nothing changed saving bundle to adding branch adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files rebase completed @ 3 P0 tags: p0.patch qtip tip qbase | o 2 P1 tags: qparent | o 1 R1 tags: | o 0 C1 tags: