probably auto-resolving of conflicts does not work sometimes?

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

More info.

I did another merge in the same branch, but with different
source branch. Now I have 5 conflicts. Eventually
I'm again have conflict in first file -- this file is
changelog file. This file contains russian text
formatted as ReStructuredText with history of my project
releases.

The same again: when I edit manually my russian file then
auto-resolve does not work.
So I did resolve this file explicitly.

Then I edit next file. This file is ascii-only C-source.
And this file auto-resolved OK.

I guess auto-resolve does not like either russian or ReStructuredText.
I mean something like title markup with equal signs:

История вносимых изменений
==========================


(I have saved copy of my changelog and .BASE/.THIS/.OTHER
files, so, if someone want to investigate what's going on,
I can send these files in private message).

[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGA6M6zYr338mxwCURAiytAJwMNJgKWJnC1S/530rqOrw25RdkywCfYsyX
ABHAuYABSb9gl4wtxfYoX/s=
=u7ou
-----END PGP SIGNATURE-----