Viewing all changes in revision 1551.12.14.
- Committer: Aaron Bentley
- Date: 2007-03-02 02:46:26 UTC
- mto: (2323.6.9 0.15-integration)
- mto: This revision was merged to the branch mainline in revision 2330.
- Revision ID: aaron.bentley@utoronto.ca-20070302024626-nxb07lxv8k162wwd
Get merge-directive command basically working
- files added:
- bzrlib/tests/blackbox/test_merge_directive.py
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
