branch | stable |
changeset 16355 | cb1475e7e5a2 |
parent 16255 | ca5cc2976574 |
child 17110 | 722fd97f6645 |
--- a/tests/test-merge-types.t Wed Apr 04 10:57:48 2012 +0200 +++ b/tests/test-merge-types.t Wed Apr 04 11:18:42 2012 +0200 @@ -89,7 +89,7 @@ a: versions differ -> m preserving a for resolve of a updating: a 1/1 files (100.00%) - couldn't find merge tool hgmerge + (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) picked tool 'internal:prompt' for a (binary False symlink True) no tool found to merge a keep (l)ocal or take (o)ther? l