/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-reference/readme.txt

  • Committer: John Arbash Meinel
  • Date: 2008-03-04 14:25:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3279.
  • Revision ID: john@arbash-meinel.com-20080304142546-zuwwy0o9roo14928
Implement cherrypick support for Merge3
When merging a cherrypick, use a slightly different resolve logic.
When encountering a conflict, the new logic does not include lines that
were present in BASE that are conflicting with OTHER.
This is done since a cherrypick is (by definition) avoiding changes that
are present in the base.
(related to bug #151731)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-reference/readme.txt
 
1
Note: The contents of the User Reference are fully generated from
 
2
Bazaar's online help topics. If you wish to edit this material,
 
3
most of it can be found under bzrlib/help_topics/. In some cases
 
4
though, the material is built by probing various internal
 
5
registries, e.g. the set of available file formats. If you're
 
6
not sure where to find the source content you're looking for,
 
7
please contact the developers on the mailing list or IRC.
 
8
See http://bazaar-vcs.org/BzrSupport for contact details.