Breezy

  1. Bug #191402
  2. Comment #1

Comment 1 for bug 191402

Revision history for this message
Aaron Bentley (abentley) wrote : Re: [Bug 191402] [NEW] bzr resolve fails on files with certain strings

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

Cameron wrote:
> Public bug reported:
>
> I had a conflict in a file that had the string ===================== in
> it.

That string, like <<<<<<< and >>>>>>>, is a conflict marker.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHsp390F+nu1YWqI0RAhF5AJ9X6MbzfO3xLmD0s4YRMP/kVt7kMgCeNI5o
XDuYLUxkbqdzUdm0uY5V3jA=
=BlLb
-----END PGP SIGNATURE-----