Mercurial > hg

view tests/test-1102.out @ 7785:660c8dd44060

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 938eddd76237
children
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
tip                                3:a49829c4fc11
t1                                 0:f7b1eb17ad24