Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 3003:ddf28837f5af mercurial-4.0
compat-test: merge future 6.7.0 into 4.0 compat branch
(merging through 4.1 compat branch)
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 01:18:39 +0200 |
| parents | 13c4d518327a 67b59d1657cf |
| children | 50be10c63825 |
comparison
equal
deleted
inserted
replaced
| 2810:604ddf1e1a8e | 3003:ddf28837f5af |
|---|---|
| 158 date: Thu Jan 01 00:00:00 1970 +0000 | 158 date: Thu Jan 01 00:00:00 1970 +0000 |
| 159 summary: babar count up to five | 159 summary: babar count up to five |
| 160 | 160 |
| 161 (fix the conflict and continue) | 161 (fix the conflict and continue) |
| 162 | 162 |
| 163 $ hg revert -r 5 --all | 163 $ hg revert -r 71c18f70c34f --all |
| 164 reverting babar | 164 reverting babar |
| 165 $ safesed 's/dix/ten/' babar | 165 $ safesed 's/dix/ten/' babar |
| 166 $ hg resolve --all -m | 166 $ hg resolve --all -m |
| 167 (no more unresolved files) | 167 (no more unresolved files) |
| 168 $ hg evolve --continue | 168 $ hg evolve --continue |