Viewing all changes in revision 5939.2.1.
- Committer: Neil Martinsen-Burrell
- Date: 2011-05-31 01:50:47 UTC
- mto: This revision was merged to the branch mainline in revision 5947.
- Revision ID: nmb@wartburg.edu-20110531015047-f8u8didg1w090eop
better document the effect of merge --force
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
