Mercurial > public > mercurial-scm > hg

diff tests/failfilemerge.py @ 30332:318a24b52eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes of non-dictionary words
author Mads Kiilerich <madski@unity3d.com>
date Mon, 17 Oct 2016 23:16:55 +0200
parents a7f8939641aa
children c0ce60459d84
line wrap: on
line diff
--- a/tests/failfilemerge.py	Thu Nov 03 17:31:14 2016 -0700
+++ b/tests/failfilemerge.py	Mon Oct 17 23:16:55 2016 +0200
@@ -1,4 +1,4 @@
-# extension to emulate interupting filemerge._filemerge
+# extension to emulate interrupting filemerge._filemerge
 
 from __future__ import absolute_import