Mercurial > hg

diff tests/test-merge-tools.t @ 18325:297bf69966a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: warn when internal:merge cannot merge symlinks A follow-up to d084df89d948. internal:merge should never be picked for merging symlinks ... but in the test suite we have HGMERGE="internal:merge" which bypasses all the usual merge-tool cleverness. Without any output it can be hard to figure out what happened and where the problem is.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:11 +0100
parents d084df89d948
children eac114e13b96
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Mon Jan 14 10:17:06 2013 -0600
+++ b/tests/test-merge-tools.t	Tue Jan 15 01:05:11 2013 +0100
@@ -843,6 +843,7 @@
   $ hg commit -qm 'f is symlink'
   $ hg merge -r 2 --tool internal:merge
   merging f
+  warning: internal:merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon