# HG changeset patch
# User timeless@mozdev.org
# Date 1345237099 25200
# Node ID d08b333816c68717b83f43be9f7d16ad66ee5d3a
# Parent  39e7e74b3cd37b9462258ac88f0d10fcf1ee3dee
spelling: sentinel

diff -r 39e7e74b3cd3 -r d08b333816c6 tests/test-simplemerge.py
--- a/tests/test-simplemerge.py	Fri Aug 17 13:58:19 2012 -0700
+++ b/tests/test-simplemerge.py	Fri Aug 17 13:58:19 2012 -0700
@@ -138,7 +138,7 @@
                     ['aaa', 'bbb', 'zz'],
                     ['zz'])
 
-        # todo: should use a sentinal at end as from get_matching_blocks
+        # todo: should use a sentinel at end as from get_matching_blocks
         # to match without zz
         self.assertEquals(list(m3.find_sync_regions()),
                           [(0, 1,  2, 3,  0, 1),
@@ -156,7 +156,7 @@
         m3 = Merge3([],
                     ['aaa', 'bbb'],
                     [])
-        # todo: should use a sentinal at end as from get_matching_blocks
+        # todo: should use a sentinel at end as from get_matching_blocks
         # to match without zz
         self.assertEquals(list(m3.find_sync_regions()),
                           [(0, 0,  2, 2,  0, 0)])