Comment 1 for bug 517490

Another occurrence while merging 5013.2.5 revid:<email address hidden> into 5029 revid:<email address hidden> on bzr.dev:

Bug Fixes
*********

* Added docstring for ``Tree.iter_changes``
  (John Arbash Meinel, #304182)

* Allow exporting a single file using ``bzr export``.
  (Michal Junák, #511987)

* Avoid infinite recursion when probing for apport.
  (Vincent Ladeuil, #516934)

<<<<<<< TREE
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
  (Martin Pool, #331095)

* Network transfer amounts and rates are now displayed in SI units according
  to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
  (Gordon Tyler, #514399)

API Changes
***********

* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
  run when starting up; it sets up several things that previously needed
  to be done separately.
  (Martin Pool, #507710)

* Remove unused ``CommandFailed`` exception.
  (Martin Pool)
=======
* ``bzr add`` will not add conflict related files unless explicitly required.
  (Vincent Ladeuil, #322767, #414589)
>>>>>>> MERGE-SOURCE

Testing
*******