Mercurial > evolve
diff tests/test-divergent.t @ 3935:9af0e2b0bdd7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 03 Aug 2018 00:19:47 +0200 |
| parents | d00f0c369bc7 |
| children | 537fd9a86c06 a2fdbece7ce1 |
line wrap: on
line diff
--- a/tests/test-divergent.t Fri Aug 03 00:19:46 2018 +0200 +++ b/tests/test-divergent.t Fri Aug 03 00:19:47 2018 +0200 @@ -60,7 +60,7 @@ $ hg log -G @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] | - | * 2:593c57f2117e@default(draft) divergent [content-divergent] + | o 2:593c57f2117e@default(draft) divergent [content-divergent] |/ o 0:9092f1db7931@default(draft) added a [] @@ -120,7 +120,7 @@ $ hg log -G @ 7:b2ae71172042@default(draft) add _c [content-divergent] | - | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] + | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |/ | o 4:45bf1312f454@default(draft) divergent [] |/ @@ -176,7 +176,7 @@ $ hg log -G @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] | - | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] + | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |/ o 0:135f39f4bd78@default(draft) add _a []