Viewing all changes in revision 1614.2.2.
- Committer: Olaf Conradi
- Date: 2006-03-21 10:17:28 UTC
- mto: (1661.1.1 bzr.mbp.remember)
- mto: This revision was merged to the branch mainline in revision 1663.
- Revision ID: olaf@conradi.org-20060321101728-09fe24e3e9cd93d9
Merge command:
* Remember location if merge failed.
* Rename some variables to clarify their use.
* Moved help text for --remember down to examples.
* Remember location if merge failed.
* Rename some variables to clarify their use.
* Moved help text for --remember down to examples.
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
