Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq.out @ 4177:ba51a8225a60
Merge with crew-stable
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 10 Mar 2007 17:45:32 -0800 |
parents | e2ed92f4c0f7 7307d2e98b32 |
children | 6cb5be6bd70f |
comparison
equal
deleted
inserted
replaced
4170:ac9e891f2c0f | 4177:ba51a8225a60 |
---|---|
89 --- a/a | 89 --- a/a |
90 +++ b/a | 90 +++ b/a |
91 @@ -1,1 +1,2 @@ a | 91 @@ -1,1 +1,2 @@ a |
92 a | 92 a |
93 +a | 93 +a |
94 % empty qrefresh | |
95 revision: | |
96 patch: | |
97 foo bar | |
98 | |
99 working dir diff: | |
100 --- a/a | |
101 +++ b/a | |
102 @@ -1,1 +1,2 @@ a | |
103 a | |
104 +a | |
94 % qpop | 105 % qpop |
95 Patch queue now empty | 106 Patch queue now empty |
96 % qpush | 107 % qpush |
97 applying test.patch | 108 applying test.patch |
98 Now at: test.patch | 109 Now at: test.patch |