← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Committer: John Arbash Meinel
Date: 2006-02-16 17:09:09 UTC
mfrom: (1185.78.7 bzr-jam-pending)
mto: (1185.50.81 bzr-jam-integration)
mto: This revision was merged to the branch mainline in revision 1554.
Revision ID: john@arbash-meinel.com-20060216170909-155c5aa4a20620dc

[merge] bump up sign-my-commits

files added:
bzrlib/sign_my_commits.py

bzrlib/tests/blackbox/test_sign_my_commits.py

files modified:
bzrlib/builtins.py

bzrlib/tests/blackbox/__init__.py

bzrlib/tests/blackbox/test_re_sign.py

Show diffs side-by-side

added added

removed removed

bzrlib/builtins.py

2207

2207

# we do need to load at least some information about them to know of

2208

2208

# aliases.

2209

2209

from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore

2210

from bzrlib.sign_my_commits import cmd_sign_my_commits

Older »