Viewing all changes in revision 4798.7.3.
- Committer: Neil Martinsen-Burrell
- Date: 2009-11-25 16:42:55 UTC
- mto: This revision was merged to the branch mainline in revision 4847.
- Revision ID: nmb@wartburg.edu-20091125164255-l7xuf1natqgy5sw2
clarify how to resolve in favor of which branch and mention --overwrite
- files modified:
- bzrlib/help_topics/en/conflicts.txt
expand all
collapse all
added
removed
