summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-07 09:10:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-07 13:17:50 -0700
commit6466fbbeef67ec398f6f5d5b5da5d6f107a647b2 (patch)
treedba6d1e8ddb52107c61ada62c14158ba40a33b03 /contrib
parentmailmap: update Pasky's address (diff)
parentGit 1.8.1.6 (diff)
downloadtgif-6466fbbeef67ec398f6f5d5b5da5d6f107a647b2.tar.xz
Sync with 1.8.1.6
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/remote-helpers/test-hg.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index 5f81dfae6c..7bb81f2f8e 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -115,7 +115,7 @@ test_expect_success 'update bookmark' '
git push
) &&
- hg -R hgrepo bookmarks | grep "devel\s\+3:"
+ hg -R hgrepo bookmarks | egrep "devel[ ]+3:"
'
test_done