To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 3277.1.1.
- Committer: Peter Schuller
- Date: 2008-03-14 21:47:45 UTC
- mto: (3313.1.1 ianc-integration)
- mto: This revision was merged to the branch mainline in revision 3314.
- Revision ID: peter.schuller@infidyne.com-20080314214745-rcrc2rtxp2w3g2hj
Document the relationship between bzr send and bzr merge. In
particular, be explicit about the support for merge directives in the
documentation of the merge command.
particular, be explicit about the support for merge directives in the
documentation of the merge command.
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
