Mercurial > hg
view tests/test-mq-qfold.out @ 8820:e8cb1fa0d4a9
test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | 2ff17c4de1da |
children | 561ff8d9e4f0 |
line wrap: on
line source
% init adding a % fold in the middle of the queue 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