/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/developers/lca_tree_merging.txt

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-09-22 02:38:35 UTC
  • mfrom: (7058.5.4 upload-symlin)
  • Revision ID: breezy.the.bot@gmail.com-20180922023835-wb9nczxp63jpeudb
Add symlink support to 'brz upload'.

Merged from https://code.launchpad.net/~jelmer/brz/upload-symlinks/+merge/355061

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/developers/lca_tree_merging.txt
47
47
Resolution Algorithm
48
48
--------------------
49
49
 
50
 
(This can be seen as ``bzrlib.merge.Merge3Merger._lca_multi_way```
 
50
(This can be seen as ``breezy.merge.Merge3Merger._lca_multi_way```
51
51
 
52
52
1. If ``THIS`` and ``OTHER`` have the same value, use it. There is no need to
53
53
   inspect any other values in this case. Either nothing was changed (all