Mercurial > hg

comparison tests/test-shelve.t @ 48592:bcc4820242cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12024
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 21 Jan 2022 13:49:11 -0800
parents 38941a28406a
children f64bbba2ee59
comparison
equal deleted inserted replaced
48591:f1162b125991 48592:bcc4820242cf
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 +<<<<<<< working-copy: 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 +>>>>>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch 426 +>>>>>>> shelved change: 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