Mercurial > hg
diff tests/test-shelve.t @ 44374:f5c006621f07
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 24 Feb 2020 13:50:55 -0500 |
| parents | d0c3eead515a 69b091cdc506 |
| children | 5c2a4f37eace |
line wrap: on
line diff
--- a/tests/test-shelve.t Thu Feb 13 22:51:17 2020 -0500 +++ b/tests/test-shelve.t Mon Feb 24 13:50:55 2020 -0500 @@ -419,11 +419,11 @@ +++ b/a/a @@ -1,2 +1,6 @@ a - +<<<<<<< shelve: 2377350b6337 - shelve: pending changes temporary commit + +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit c +======= +a - +>>>>>>> working-copy: 203c9f771d2b - shelve: changes to: [mq]: second.patch + +>>>>>>> shelve: 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