[MERGE] encoding_type = 'exact' in cmd_merge_directive

[Adeodato Simó]

Hello.

This small patch adds encoding_type = 'exact' to merge-directive; on IRC
John agreed this should be the case. Fixes LP #120591.

Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
Now, now, my good man, this is no time for making enemies.
                -- Voltaire, on his deathbed, in response to
                   a priest asking that he renounce Satan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr.merge_directive_exact_encoding.diff
Type: text/x-diff
Size: 1646 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070617/11a2a0c4/attachment.bin