Mercurial > public > mercurial-scm > hg

diff tests/test-flags.t @ 18334:44bda93df90e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: changing the mode of a file is also an update It was a change in the file system that wasn't reported in the summaries.
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 10 Jan 2013 00:44:23 +0100
parents b87acfda5268
children 557c8522aec0
line wrap: on
line diff
--- a/tests/test-flags.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-flags.t	Thu Jan 10 00:44:23 2013 +0100
@@ -79,7 +79,7 @@
 
   $ hg -v merge
   resolving manifests
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cd ../test3
@@ -128,7 +128,7 @@
 
   $ hg -v merge
   resolving manifests
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ ls -l ../test[123]/a > foo