Mercurial > evolve
diff tests/test-topic-stack.t @ 3273:c0ee9ddfd5ff mercurial-4.3
test-compat: merge stable into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 11 Dec 2017 09:33:04 +0100 |
| parents | f5d472b7e800 8cc8fb94cc00 |
| children | ddbb4d069203 4303a46b4167 |
line wrap: on
line diff
--- a/tests/test-topic-stack.t Tue Nov 14 23:15:18 2017 +0100 +++ b/tests/test-topic-stack.t Mon Dec 11 09:33:04 2017 +0100 @@ -553,7 +553,7 @@ $ hg stack foo ### topic: foo - ### target: default (branch), ambigious rebase destination - topic 'foo' has 3 heads + ### target: default (branch), ambiguous rebase destination - topic 'foo' has 3 heads t4: c_f ^ c_e t3: c_h @@ -645,7 +645,7 @@ t0^ c_A (base) $ hg stack blue ### topic: blue - ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads + ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads t3@ c_I (current) ^ c_H t2: c_D @@ -698,7 +698,7 @@ $ hg stack red ### topic: red - ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads + ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads t5$ c_H (unstable) ^ c_G ^ c_D @@ -710,7 +710,7 @@ t0^ c_A (base) $ hg stack blue ### topic: blue - ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads + ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads t3$ c_I (unstable) ^ c_H t2$ c_G (unstable) @@ -772,7 +772,7 @@ $ hg stack red ### topic: red - ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads + ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads t5$ c_H (unstable) ^ c_G ^ c_D @@ -784,7 +784,7 @@ t0^ c_A (base) $ hg stack blue ### topic: blue - ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads + ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads t3$ c_I (unstable) ^ c_H t2$ c_G (unstable)