Mercurial > hg
view tests/test-paths @ 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 | 92eb0a019bf2 |
children |
line wrap: on
line source
#!/bin/sh hg init a hg clone a b cd a echo '[paths]' >> .hg/hgrc echo 'dupe = ../b' >> .hg/hgrc hg in dupe | fgrep '../' cd .. hg -R a in dupe | fgrep '../' true