Mercurial > hg
view tests/test-mq-qfold.out @ 9323:f6683a7011e9
Backed out changeset 26fa0e31011d.
On OS X, it broke test-issue322, test-issue660, test-permissions,
test-symlink-addremove, and test-walk.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 05 Aug 2009 22:51:30 -0700 |
parents | 561ff8d9e4f0 |
children | 296a0b14a686 |
line wrap: on
line source
% init adding a % fold in the middle of the queue popping p3 popping p2 now at: p1 --- a/a +++ b/a @@ -1,1 +1,2 @@ a +a p1 p3 --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b % fold with local changes abort: local changes found, refresh first --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b