diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-09 01:23:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-09 01:23:46 +0400 |
| commit | 414c78ccff47f8261b102b1842ff66a475cf7e7b (patch) | |
| tree | 64185ec1102cb0c5d6c13863530d66f34b2f5c92 /contrib | |
| parent | 69637e5e6d79dbef18ebb89c7d1885cca30496f4 (diff) | |
| parent | 283b365e4521082ab37d93762bb2f049dc38bee8 (diff) | |
Merge branch 'maint'
* maint:
t1402: work around shell quoting issue on NetBSD
remote-hg: Fix biridectionality -> bidirectionality typos
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 2 | ||||
| -rwxr-xr-x | contrib/remote-helpers/test-hg-bidi.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 016cdadb4d..c7006000a6 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -31,7 +31,7 @@ import urllib # hg: # Emulate hg-git. # Only hg bookmarks are exported as git branches. -# Commits are modified to preserve hg information and allow biridectionality. +# Commits are modified to preserve hg information and allow bidirectionality. # NAME_RE = re.compile('^([^<>]+)') diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh index a94eb28092..1d61982436 100755 --- a/contrib/remote-helpers/test-hg-bidi.sh +++ b/contrib/remote-helpers/test-hg-bidi.sh @@ -6,7 +6,7 @@ # https://bitbucket.org/durin42/hg-git/src # -test_description='Test biridectionality of remote-hg' +test_description='Test bidirectionality of remote-hg' . ./test-lib.sh |