Mercurial > hg
view tests/test-commit-copy @ 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 | c0b449154a90 |
children |
line wrap: on
line source
#!/bin/sh hg init dir cd dir echo bleh > bar hg add bar hg ci -m 'add bar' hg cp bar foo echo >> bar hg ci -m 'cp bar foo; change bar' hg debugrename foo hg debugindex .hg/store/data/bar.i