comparison tests/test-divergent.t @ 1797:4de90774eade mercurial-3.7

merge with 5.6.0 Not extra change were needed from the mercurial-3.8 branch
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 01 Feb 2017 15:40:51 +0100
parents 35c666ef724e
children 05d7df73a56b 9f42f819267b
comparison
equal deleted inserted replaced
1796:2be05515b142 1797:4de90774eade