TODO features, merge binary file as text

[Pavel Ajtkulov]

Hi,

Problem:
We have text file (UTF16), which contains ('\00') char, and Mercurial
treats this file as binary.
There is trouble with merge this file.

Can mercurial-team implement following feature?:

When merging file, select 3 ways: local/other/merge_as_text
On merge_as_text  exec "diff -a".

Currently, hg offers only 2 ways: local/other

tool kdiff3 can't handle binary
tool tortoisemerge can't handle binary
tool docdiff can't handle binary
 no tool found to merge file.txt
keep (l)ocal or take (o)ther?

May be, there are other solutions...

----
Pavel Ajtkulov
ajtkulov at gmail.com