~divmod-dev/divmod.org/dbapi2-compliant-2618

Viewing all changes in revision 2498.

  • Committer: washort
  • Date: 2008-05-23 17:36:34 UTC
  • Revision ID: svn-v4:866e43f7-fbfc-0310-8f2a-ec88d1da2979:trunk:15918
Merge no-unclean-merge-2301.
`unbranch` will no longer merge into trunk's working copy if it contains modifications, unless '--force' is used.

Author: washort
Reviewer: exarkun

Closes #2301.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: