Mercurial > hg
view tests/test-issue433 @ 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 | 7a7d4937272b |
children | 1de6e7e1bb9f |
line wrap: on
line source
#!/bin/sh # http://www.selenic.com/mercurial/bts/issue433 hg init a cd a echo a > a hg commit -Ama hg parents -r 0 doesnotexist true