Mercurial > hg

comparison tests/test-shelve.t @ 44374:f5c006621f07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Mon, 24 Feb 2020 13:50:55 -0500
parents d0c3eead515a 69b091cdc506
children 5c2a4f37eace
comparison
equal deleted inserted replaced
44372:8407031f195f 44374:f5c006621f07
417 diff --git a/a/a b/a/a 417 diff --git a/a/a b/a/a
418 --- a/a/a 418 --- a/a/a
419 +++ b/a/a 419 +++ b/a/a
420 @@ -1,2 +1,6 @@ 420 @@ -1,2 +1,6 @@
421 a 421 a
422 +<<<<<<< shelve: 2377350b6337 - shelve: pending changes temporary commit 422 +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
423 c 423 c
424 +======= 424 +=======
425 +a 425 +a
426 +>>>>>>> working-copy: 203c9f771d2b - shelve: changes to: [mq]: second.patch 426 +>>>>>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch
427 diff --git a/b/b b/b.rename/b 427 diff --git a/b/b b/b.rename/b
428 rename from b/b 428 rename from b/b
429 rename to b.rename/b 429 rename to b.rename/b
430 diff --git a/c b/c.copy 430 diff --git a/c b/c.copy
431 copy from c 431 copy from c