Mercurial > hg
view tests/test-debugrename @ 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 | 5a088ac232e6 |
children |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg ci -Am t hg mv a b hg ci -Am t1 hg debugrename b hg mv b a hg ci -Am t2 hg debugrename a echo % test with --rev hg debugrename --rev 1 b