Enable to select encoding in hgrc web section
This patch provides character encoding setting in each repository. After this
patch, You can use multi encoding repositories with one mercurial server.
hgk: Use $HG instead of hg (see
849f011dbf79)
hgeditor: Use $HG to run 'hg diff' (see
849f011dbf79)
archive: remove spurious flag_bits setting
This makes zip -T on resulting archives work. File permissions are
still retained.
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.