Move win32 find_in_files from util_win32 to util.

mq: fix qtop failure when the series ends with guarded patches.

Test qtop breaking when series ends with guarded patches.

Merge with stable

mq: account for readheaders munging in qrefresh

Merge with crew-stable

Update Windows build instructions.

merge: reorganize some hunks in findcopies

merge: simplify a check in checkcopies

merge: expand and simplify the invalid handling for directory moves

merge: fix a bug detecting directory moves When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.

merge: clarify the findcopies code

verify: hold write lock Verify will report spurious errors if commits or pulls happen during verify.

Also restore old rm -A behavior for inexact patterns

Fix rm -A with no patterns, which I just broke.

Make rm --after simply mark files as removed, unless --force is also given

Add hgwebdir.fcgi to contrib

Flesh out bisect help text

Merge with crew

Fix minor mismerge. The caching of umask ended up being duplicated.

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

Add notes about configuring a merge program

Update copyright year and change to range

Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.