~divmod-dev/divmod.org/athena-events-806545

  • Committer: exarkun
  • Date: 2009-11-25 18:48:46 UTC
  • Revision ID: svn-v4:866e43f7-fbfc-0310-8f2a-ec88d1da2979:trunk:17847
Merge combinator-non-interactive-merge-2984

Author: exarkun
Reviewer: faldridge
Fixes: #2984

Add the --non-interactive flag to the svn merge command to avoid the new
interactive merging behavior in subversion 1.6.
Filename Latest Rev Last Changed Committer Comment Size
..
bin 374 18 years ago moe copy svn/Pyflakes/trunk -> svn/Divmod/trunk/Pyflak Diff
pyflakes 374 18 years ago moe copy svn/Pyflakes/trunk -> svn/Divmod/trunk/Pyflak Diff
LICENSE 374 18 years ago moe copy svn/Pyflakes/trunk -> svn/Divmod/trunk/Pyflak 1 KB Diff Download File
NEWS.txt 2587 15 years ago exarkun Merge pyflakes-0.3.0-release Fixes #2829 Bump th 560 bytes Diff Download File
File setup.py 2587 15 years ago exarkun Merge pyflakes-0.3.0-release Fixes #2829 Bump th 714 bytes Diff Download File