comparison tests/test-simplemerge.py.out @ 15696:0cb45fef99ba

phases: Add a third phase for secret changeset
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sun, 18 Dec 2011 23:16:46 +0100
parents 2e3c54fb79a3
children f18830651811
comparison
equal deleted inserted replaced
15695:1b9dcf2eb011 15696:0cb45fef99ba