filemerge: use working dir parent as ancestor for backward wdir merge
I checked the tests, they were bogus in the first place
filectx: _fileid isn't normalized, use _filenode instead
_fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we
should use something stable for comparisons (like _filenode).
convert: write "repository" instead of "repo"
We should strive to avoid slang in our messages to the users.
minirst: add margin around definition items
This greatly improves the output of 'hg help env'.
mq: only highlight/label patch name for qseries.
Restore the behaviour introduced in
e37e9904bf10, which was
accidentally removed when labelling was introduced in
717c35d55fb3.
wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi