Bazaar

  1. Bug #562669
  2. Comment #2

Comment 2 for bug 562669

Revision history for this message
John A Meinel (jameinel) wrote : Re: [Bug 562669] [NEW] provide base text in text conflicts

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

Jelmer Vernooij wrote:
> Public bug reported:
>
> It would be nice if Bazaar could provide the contents of a conflicting
> text region as they were in the base revision in addition to the
> contents in the THIS and OTHER revisions (where relevant). This can
> often be useful when resolving merge conflicts.
>
> ** Affects: bzr
> Importance: Undecided
> Status: New
>

You mean 'bzr merge --show-base' ?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkvFM8gACgkQJdeBCYSNAAMLfwCg0Y9G7UnyOz5vCG+PNrU7V3bG
HpEAnR8mXhanTy7Fe8/j/bmEsqDvwFkG
=RUs4
-----END PGP SIGNATURE-----