Mercurial > hg
diff tests/test-shelve.t @ 48592:bcc4820242cf
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 |
line wrap: on
line diff
--- a/tests/test-shelve.t Fri Jan 21 13:48:18 2022 -0800 +++ b/tests/test-shelve.t Fri Jan 21 13:49:11 2022 -0800 @@ -419,11 +419,11 @@ +++ b/a/a @@ -1,2 +1,6 @@ a - +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit + +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit c +======= +a - +>>>>>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch + +>>>>>>> shelved change: 203c9f771d2b - shelve: changes to: [mq]: second.patch diff --git a/b/b b/b.rename/b rename from b/b rename to b.rename/b