Mercurial > evolve
diff tests/test-tutorial.t @ 652:5a929510de9d
merge with filtering change (DO NOT USE WITHOUT FILTERING)
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Fri, 04 Jan 2013 12:43:22 +0100 |
| parents | 629ec7f612aa e291e5271694 |
| children | c56109c9aebf |
line wrap: on
line diff
--- a/tests/test-tutorial.t Fri Jan 04 12:42:43 2013 +0100 +++ b/tests/test-tutorial.t Fri Jan 04 12:43:22 2013 +0100 @@ -220,7 +220,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - (run 'hg heads .' to see heads, 'hg merge' to merge) + (run 'hg heads' to see heads, 'hg merge' to merge) I now have a new heads. Note that this remote head is immutable @@ -568,7 +568,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - (run 'hg heads .' to see heads, 'hg merge' to merge) + (run 'hg heads' to see heads, 'hg merge' to merge) 1 new unstable changesets