comparison mercurial/simplemerge.py @ 29937:2c302c654451

merge with stable
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 14 Sep 2016 17:12:39 +0200
parents c3e9269d9602
children 5f7d13d3bd4d
comparison
equal deleted inserted replaced
29936:3e7ded768556 29937:2c302c654451