Viewing all changes in revision 363.
- Committer: James Westby
- Date: 2009-08-24 17:33:44 UTC
- mfrom: (360.1.49 builddeb)
- Revision ID: james.westby@canonical.com-20090824173344-1g17an4vkwj6chcu
Merge merge-package command from Muharem.
merge-package allows you to merge another package branch, ensuring that
there aren't spurious conflicts due to divergence in the upstream ancestry.
merge-package allows you to merge another package branch, ensuring that
there aren't spurious conflicts due to divergence in the upstream ancestry.
- files added:
- merge_package.py
- files modified:
- __init__.py
expand all
collapse all
added
removed
