summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-11-12 11:44:33 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-11-12 11:44:33 +0000
commit6eca890690217136a9685ca9ac55f6ea59882e9c (patch)
tree6795cf865cda14285418fc07fc12654713f084cb /tests.branching
parent5f22ded9711a047704fc91b68a182b057e29bc0f (diff)
parentf4894d37cd96953707635ea1902a0a115741f4e3 (diff)
downloadmorph-6eca890690217136a9685ca9ac55f6ea59882e9c.tar.gz
Merge branch 'samthursfield/spelling-fixes' of git://git.baserock.org/baserock/morph
Diffstat (limited to 'tests.branching')
-rwxr-xr-xtests.branching/ambiguous-refs.script2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/ambiguous-refs.script b/tests.branching/ambiguous-refs.script
index 3321a310..92b80d4a 100755
--- a/tests.branching/ambiguous-refs.script
+++ b/tests.branching/ambiguous-refs.script
@@ -15,7 +15,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-# 'git show-ref master' sorts its output alphebetically, so we can't rely on
+# 'git show-ref master' sorts its output alphabetically, so we can't rely on
# it to resolve 'master': we might get 'alpha/master' instead.
set -eu