Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 3184:37aebaa73248 stable
branching: merge with an old and strange head
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 14 Nov 2017 23:04:04 +0100 |
| parents | 663dbef40f97 |
| children | 9f900937c198 ae6fddf39933 |
comparison
equal
deleted
inserted
replaced
| 3182:bc09dd507c41 | 3184:37aebaa73248 |
|---|