probably auto-resolving of conflicts does not work sometimes?

[Alexander Belchenko]

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

I did merge and have conflicts in 2 files.
I edit first file, manually change conflicted region
and delete all <<<<<< markers.
Second file still has conflicts.

Then I run 'bzr resolve' and expect that bzr will
auto-resolve conflict in first file. But it does not:

$ bzr resolve
0 conflict(s) auto-resolved.

Why?

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

iD8DBQFGA5MqzYr338mxwCURApDRAJ9se5CMdi9eRbt5P11wpxSk8+cWNgCfWGCM
G41Lj+k0E5mqauMqrlEkYnc=
=OkrR
-----END PGP SIGNATURE-----