lp:~nmb/bzr/fix-213184
Created by
Neil Martinsen-Burrell
and last modified
Only
Neil Martinsen-Burrell
can upload to this branch. If you are
Neil Martinsen-Burrell
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- John A Meinel: Approve
- Robert Collins (community): Approve
-
Diff: 70 lines (+26/-5)2 files modifiedbzrlib/conflicts.py (+3/-5)
bzrlib/help_topics/en/conflicts.txt (+23/-0)
Related bugs
Bug #213184: 'conflicting tags' could be more helpful | Wishlist | Fix Released |
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr