Mercurial > hg
view tests/test-strict @ 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 | 4e815ee377fd |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg ci -d '0 0' -Ama hg an a echo "[ui]" >> $HGRCPATH echo "strict=True" >> $HGRCPATH hg an a hg annotate a echo % should succeed - up is an alias, not an abbreviation hg up