Mercurial > public > mercurial-scm > hg

diff tests/test-rename-merge2.t @ 21024:7731a2281cf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes from spell checker
author Mads Kiilerich <madski@unity3d.com>
date Sun, 13 Apr 2014 19:01:00 +0200
parents 18adc15635a1
children 0d67fccc0d43
line wrap: on
line diff
--- a/tests/test-rename-merge2.t	Sun Apr 13 19:01:00 2014 +0200
+++ b/tests/test-rename-merge2.t	Sun Apr 13 19:01:00 2014 +0200
@@ -774,7 +774,7 @@
 
 Systematic and terse testing of merge merges and ancestor calculation:
 
-Excpected result:
+Expected result:
 
 \  a  m1  m2  dst
 0  -   f   f   f   "versions differ"