Mercurial > hg-stable

diff tests/test-merge7.t @ 18541:5ed6a375e9ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: delay debug messages for merge actions Show messages at a point where the actions have been sorted, thus preparing for backout of 760c0d67ce5e. This makes manifestmerge more of a silent operation, just like 'copies' is. Indent 'preserving' messages to make them subordinate to the action logging so they fit in the new context. (The 'preserving' messages are quite redundant and could also be removed completely.)
author Mads Kiilerich <madski@unity3d.com>
date Thu, 24 Jan 2013 23:57:44 +0100
parents b87acfda5268
children bcf29565d89f
line wrap: on
line diff
--- a/tests/test-merge7.t	Thu Jan 24 23:57:44 2013 +0100
+++ b/tests/test-merge7.t	Thu Jan 24 23:57:44 2013 +0100
@@ -84,7 +84,7 @@
    overwrite: False, partial: False
    ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
    test.txt: versions differ -> m
-  preserving test.txt for resolve of test.txt
+    preserving test.txt for resolve of test.txt
   updating: test.txt 1/1 files (100.00%)
   picked tool 'internal:merge' for test.txt (binary False symlink False)
   merging test.txt