Mercurial > hg-stable
diff tests/test-subrepo-git.t @ 13560:a2734c8322ac
merge with stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 07 Mar 2011 23:19:17 +0100 |
parents | f854b775c386 |
children | 3ab3b892d223 |
line wrap: on
line diff
--- a/tests/test-subrepo-git.t Mon Mar 07 15:46:46 2011 -0600 +++ b/tests/test-subrepo-git.t Mon Mar 07 23:19:17 2011 +0100 @@ -329,7 +329,7 @@ abort: subrepo s is missing [255] $ hg update -C - cloning subrepo s + cloning subrepo s from $TESTTMP/gitroot 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg sum | grep commit commit: (clean)