Mercurial > hg-stable
changeset 17513:d08b333816c6
spelling: sentinel
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 17 Aug 2012 13:58:19 -0700 |
| parents | 39e7e74b3cd3 |
| children | 6ed711812ba9 |
| files | tests/test-simplemerge.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)])