Mercurial > hg-stable

diff tests/test-merge-force.t @ 23543:4dd8a6a1240d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: fixes from proofreading of spell checker issues
author Mads Kiilerich <madski@unity3d.com>
date Thu, 17 Apr 2014 22:47:38 +0200
parents eeecf29cc397
children ef1eb6df7071
line wrap: on
line diff
--- a/tests/test-merge-force.t	Sat Dec 13 09:45:00 2014 +0100
+++ b/tests/test-merge-force.t	Thu Apr 17 22:47:38 2014 +0200
@@ -228,11 +228,11 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
-Check which files need to be resolved (should correspond to the ouput above).
+Check which files need to be resolved (should correspond to the output above).
 This should be the files for which the base (1st filename segment), the remote
 (2nd segment) and the working copy (4th segment) are all different.
 
-Interestingly, one untracked file got merged and added, which corresponds the
+Interestingly, one untracked file got merged and added, which corresponds to the
 odd 'if force and branchmerge and different' case in manifestmerge().
 
   $ hg resolve -l