equal
deleted
inserted
replaced
229 +<<<<<<< dest: * - shelve: pending changes temporary commit (glob) |
229 +<<<<<<< dest: * - shelve: pending changes temporary commit (glob) |
230 c |
230 c |
231 +======= |
231 +======= |
232 +a |
232 +a |
233 +>>>>>>> source: 4702e8911fe0 - shelve: changes to '[mq]: second.patch' |
233 +>>>>>>> source: 4702e8911fe0 - shelve: changes to '[mq]: second.patch' |
234 diff --git a/b.rename/b b/b.rename/b |
234 diff --git a/b/b b/b.rename/b |
235 new file mode 100644 |
235 rename from b/b |
236 --- /dev/null |
236 rename to b.rename/b |
237 +++ b/b.rename/b |
|
238 @@ -0,0 +1,1 @@ |
|
239 +b |
|
240 diff --git a/b/b b/b/b |
237 diff --git a/b/b b/b/b |
241 deleted file mode 100644 |
238 deleted file mode 100644 |
242 --- a/b/b |
239 --- a/b/b |
243 +++ /dev/null |
240 +++ /dev/null |
244 @@ -1,1 +0,0 @@ |
241 @@ -1,1 +0,0 @@ |
245 -b |
242 -b |
246 diff --git a/c.copy b/c.copy |
243 diff --git a/c b/c.copy |
247 new file mode 100644 |
244 copy from c |
248 --- /dev/null |
245 copy to c.copy |
249 +++ b/c.copy |
|
250 @@ -0,0 +1,1 @@ |
|
251 +c |
|
252 $ hg resolve -l |
246 $ hg resolve -l |
253 U a/a |
247 U a/a |
254 |
248 |
255 $ hg shelve |
249 $ hg shelve |
256 abort: unshelve already in progress |
250 abort: unshelve already in progress |