view tests/test-rebase-mq-skip.out @ 8545:3682a19bb637

merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.
author Steve Borho <steve@borho.org>
date Fri, 22 May 2009 11:42:21 -0500
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: