Bazaar

  1. Bug #85524
  2. Comment #2

Comment 2 for bug 85524

Revision history for this message
Marius Kruger (amanica) wrote :

I assume this was fixed in 1.8 when Bug #3439 was fixed (its broken in 1.6 and works in 1.9)

the new behaviour looks much better:
$ bzr ann x
1 marius. | x
3? marius. | <<<<<<< TREE
2 marius. | y
3? marius. | =======
1.1.1 nobody | z
3? marius. | >>>>>>> MERGE-SOURCE

in stead of the old:
$ /stuph/projects/bzr/bzr.repo/bzr.1.6/bzr --no-plugins ann x
1 marius. | x
2 marius. | y