Mercurial > hg
view tests/test-mq-symlinks.out @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 22:47:38 +0100 |
parents | fb32ae9c76e7 |
children | 561ff8d9e4f0 ea1935e2020a |
line wrap: on
line source
a -> a not a symlink a -> b now at: base.patch applying symlink.patch now at: symlink.patch a -> b now at: symlink.patch applying removesl.patch now at: removesl.patch C b