--- a/tests/test-git-submodules	Thu Feb 23 13:49:07 2012 -0500
+++ b/tests/test-git-submodules	Sat Mar 31 13:35:49 2012 -0500
@@ -26,7 +26,7 @@
 {
     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-    git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
+    git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" | sed 's/, 0 deletions(-)//'
     count=`expr $count + 1`
 }
 
@@ -58,10 +58,10 @@
 
 git clone ../gitrepo1 . | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
 git submodule add ../gitsubrepo subrepo | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$'
-git commit -m 'add subrepo'
+git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//'
 git rm --cached subrepo
 git rm .gitmodules
-git commit -m 'rm subrepo'
+git commit -m 'rm subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//'
 cd ..
 
 hg clone gitrepo2 hgrepo | grep -v '^updating'

--- a/tests/test-git-submodules.out	Thu Feb 23 13:49:07 2012 -0500
+++ b/tests/test-git-submodules.out	Sat Mar 31 13:35:49 2012 -0500
@@ -7,13 +7,13 @@
 Initialized empty Git repository in ...
 
 [master e42b08b] add subrepo
- 2 files changed, 4 insertions(+), 0 deletions(-)
+ 2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 subrepo
 rm 'subrepo'
 rm '.gitmodules'
 [master 7e4c934] rm subrepo
- 2 files changed, 0 insertions(+), 4 deletions(-)
+ 2 files changed, 4 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 subrepo
 importing git objects into hg

--- a/tests/test-merge	Thu Feb 23 13:49:07 2012 -0500
+++ b/tests/test-merge	Sat Mar 31 13:35:49 2012 -0500
@@ -26,7 +26,7 @@
 {
     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-    git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
+    git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" | sed 's/, 0 deletions(-)//'
     count=`expr $count + 1`
 }
 
@@ -48,7 +48,7 @@
 commit -m 'add gamma'
 
 # clean merge
-git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/'
+git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/'
 
 cd ..
 mkdir gitrepo2

--- a/tests/test-merge.out	Thu Feb 23 13:49:07 2012 -0500
+++ b/tests/test-merge.out	Sat Mar 31 13:35:49 2012 -0500
@@ -4,7 +4,7 @@
 Switched to branch "master"
 Merge successful
  beta |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+), 0 deletions(-)
  create mode 100644 beta
 Initialized empty Git repository in gitrepo2/
 

--- a/tests/test-octopus	Thu Feb 23 13:49:07 2012 -0500
+++ b/tests/test-octopus	Sat Mar 31 13:35:49 2012 -0500
@@ -26,7 +26,7 @@
 {
     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-    git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
+    git commit "$@" >/dev/null 2>/dev/null || echo "git commit error" | sed 's/0 deletions(-)//'
     count=`expr $count + 1`
 }