/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

Support reading user identity from .git/config in git repositories.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-email/+merge/380997

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