equal
deleted
inserted
replaced
97 foo bar |
97 foo bar |
98 |
98 |
99 diff -r xa |
99 diff -r xa |
100 --- a/a |
100 --- a/a |
101 +++ b/a |
101 +++ b/a |
102 @@ -1,1 +1,2 @@ a |
102 @@ -1,1 +1,2 @@ |
103 a |
103 a |
104 +a |
104 +a |
105 % empty qrefresh |
105 % empty qrefresh |
106 revision: |
106 revision: |
107 patch: |
107 patch: |
108 foo bar |
108 foo bar |
109 |
109 |
110 working dir diff: |
110 working dir diff: |
111 --- a/a |
111 --- a/a |
112 +++ b/a |
112 +++ b/a |
113 @@ -1,1 +1,2 @@ a |
113 @@ -1,1 +1,2 @@ |
114 a |
114 a |
115 +a |
115 +a |
116 % qpop |
116 % qpop |
117 Patch queue now empty |
117 Patch queue now empty |
118 % qpush |
118 % qpush |
247 foo |
247 foo |
248 |
248 |
249 diff -r cb9a9f314b8b a |
249 diff -r cb9a9f314b8b a |
250 --- a/a |
250 --- a/a |
251 +++ b/a |
251 +++ b/a |
252 @@ -1,1 +1,2 @@ a |
252 @@ -1,1 +1,2 @@ |
253 a |
253 a |
254 +a |
254 +a |
255 diff -r cb9a9f314b8b b/f |
255 diff -r cb9a9f314b8b b/f |
256 --- /dev/null |
256 --- /dev/null |
257 +++ b/b/f |
257 +++ b/b/f |