comparison mercurial/merge.py @ 15694:1e4e49c58b94

phases: add a bit more test for local phase movement.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sun, 18 Dec 2011 23:15:12 +0100
parents 7b7f03502b5a
children 0bd17a4bed88
comparison
equal deleted inserted replaced
15693:54f2205d8ea9 15694:1e4e49c58b94