Mercurial > evolve
changeset 138:605ed785268a
stuff that pass
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 17 Feb 2012 19:08:36 +0100 |
parents | bbc653876876 |
children | 9b9500175ae5 |
files | tests/test-evolve.t |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve.t Fri Feb 17 19:01:25 2012 +0100 +++ b/tests/test-evolve.t Fri Feb 17 19:08:36 2012 +0100 @@ -215,10 +215,10 @@ feature-B 4:f8111a076f09 $ hg up 6 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg bookmark -if feature-A $ hg bookmark feature-A 6:23409eba69a0 feature-B 4:f8111a076f09 - $ hg bookmark -if feature-A $ hg graft -O 4 grafting revision 4 merging main-file-1