Mercurial > hg-stable
changeset 44471:68e14fecd82a
copies-tests: swap two branch description
They were swapped and now match their intended block.
Differential Revision: https://phab.mercurial-scm.org/D8247
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 06 Mar 2020 11:02:02 +0100 |
| parents | 9d2b2df2c2ba |
| children | b8882f5d7cb4 |
| files | tests/test-copies-chain-merge.t |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-copies-chain-merge.t Fri Mar 06 13:27:41 2020 -0500 +++ b/tests/test-copies-chain-merge.t Fri Mar 06 11:02:02 2020 +0100 @@ -39,7 +39,7 @@ o 0 i-0 initial commit: a b] -Have a branching with nothing on one side +And having another branch with renames on the other side $ hg mv d e $ hg ci -Am 'a-1: d -move-> e' @@ -57,7 +57,7 @@ o 0 i-0 initial commit: a b] -And Having another branch with renames on the other side +Have a branching with nothing on one side $ hg up 'desc("i-2")' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved