[1.0.X] Block r9643 (code removal) and r9646 (fix to code present only in trunk) from svnmerge.py consideration.

Browse Source

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9653 bcc190cf-cafb-0310-a4f2-bffc1f526a37

...

This commit is contained in:

Karen Tracey 2008-12-16 14:26:02 +00:00

parent 01e04e90e0

commit 8cc518a964

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available