diff tests/test-stabilize-conflict.t @ 747:9300f48786de

test: prepare test for core changeset 9c78ed396075 New changeset in mercurial 2.8 (9c78ed396075) change rebase behavior to preverse the original working directory. This break an handfull of test so we preventively update to tip after rebase.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 15 Nov 2013 18:53:29 -0500
parents 760d01a549a6
children 17ac69db9329
line wrap: on
line diff