Mercurial > hg
view tests/test-issue1089 @ 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 | 2268edff1bec |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a mkdir a echo a > a/b hg ci -Am m hg rm a hg ci -m m a mkdir a b echo a > a/b hg ci -Am m hg rm a cd b # relative delete hg ci -m m ../a