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.
audit: check for casefolding of .hg (
issue1450)
patch: teach selectfile about symlinks (
issue1438)
mq: handle empty patches more gracefully (
issue1501)
keepalive: borrow code from newer httplib to patch ValueError (
issue1088)
rename: simplify forced renaming
This should help work around virus scanner issues with rename on Windows.
log: ignore --removed if no files specified (
issue1166)
Otherwise we filter out merge changesets with no changed files