filemerge: add internal:dump
This create foo.{local,other,base} files for people to manually merge
files while littering their working directory.
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Convert now handles errors from p4 during conversion more gracefully.
If keyword expansion is enabled in a P4 file then keywords will be
unexpanded in hg.
Added testcase for p4 filetypes and keyword (un)expansion.
This testcase ignores UTF and Apple files to avoid binary data.
Edited by pmezard: fixed collation issue on OSX
patchbomb: update test output to match
2aff285b902f
patchbomb: do not assume the presence of angle brackets around msg-id
RFC 5322 states:
"Semantically, the angle bracket characters are not part of the
msg-id; the msg-id is what is contained between the two angle bracket
characters."
Hence it should be correct to pass a message Id with no angle brackets
to --in-reply-to. Adding them if missing.