Mercurial > hg-stable

diff tests/test-flags.t @ 18337:557c8522aec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: better test coverage of merges of flags This makes existing problems with merges of symlinks and files more obvious and add test coverage for tricky merges without real common ancestors.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:12 +0100
parents 44bda93df90e
children 7a9cbb315d84
line wrap: on
line diff
--- a/tests/test-flags.t	Thu Jan 10 03:40:45 2013 +0100
+++ b/tests/test-flags.t	Tue Jan 15 01:05:12 2013 +0100
@@ -81,6 +81,9 @@
   resolving manifests
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
+  $ cat a
+  123
+  $ [ -x a ]
 
   $ cd ../test3
   $ echo 123 >>b