Mercurial > hg > hg-git
changeset 314:3aa43b60697c
Merge test fix.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Mon, 05 Apr 2010 18:52:58 -0500 |
parents | b1d6c7fe2f81 (current diff) a8b34be04b6a (diff) |
children | 6f06c47842d6 |
files | |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-pull-after-strip +++ b/tests/test-pull-after-strip @@ -89,7 +89,7 @@ hg strip tip 2>&1 | grep -v saving hg pull -r beta hg git-cleanup -echo % pull works after `hg git-cleanup` +echo % pull works after \'hg git-cleanup\' hg pull -r beta hg log --graph
--- a/tests/test-pull-after-strip.out +++ b/tests/test-pull-after-strip.out @@ -48,7 +48,7 @@ importing Git objects into Hg abort: you appear to have run strip - please run hg git-cleanup git commit map cleaned -% pull works after git commit map cleaned +% pull works after 'hg git-cleanup' pulling from git://localhost/gitrepo importing Hg objects into Git Counting objects: 6, done.