diff tests/test-stabilize-conflict.t @ 576:cf116ffc9cc5 stable

evolve: new divergent revset
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 27 Sep 2012 16:55:08 +0200
parents 362e65fc6146
children 4676650f4f9d
line wrap: on
line diff