Mercurial > evolve
comparison MANIFEST.in @ 5843:6798147f6e58
branching: merge with the wrong head
(keep the change from the right branch only)
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 12 Mar 2021 11:13:16 +0100 |
parents | fa2fc0cad459 |
children | 7f95546f584e dd518437d4e0 |
comparison
equal
deleted
inserted
replaced
5842:ce765eb3cfd2 | 5843:6798147f6e58 |
---|