Attached is a diff file I created. git won't allow me to push the commit.
It tells me to pull then merge. I do a pull and then it won't let me merge.

The documentation at
https://github.com/sympy/sympy/wiki/Development-workflow
help in the simplest cases.

The attached patch is based against a version of sympy from a few weeks ago.
I have been working most of the day on it, and it seems to pass all tests
and have
correct html.

Sorry for being such an idiot and spamming the sympy devel list but I
wasn't sure if
github would accept an attachment. Maybe someone else can do something with
it.


On Sun, Mar 10, 2013 at 6:26 PM, Aaron Meurer <notifications@github.com>wrote:

> In sympy/crypto/crypto.py:
>
> > @@ -0,0 +1,1240 @@
> > +"""
> > +Classical ciphers and LFSRs
> > +"""
> > +
> > +def alphabet_of_cipher(symbols = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"):
> > +    """
> > +    Returns the list of characters in the string input defining the alphabet.
> > +
> > +    Notes
> > +    =====
> > +
> > +    First, some basic definitions.
> > +
> > +    A {\it substitution cipher} is a method of encryption by which
> > +    ``units'' (not necessarily characters) of plaintext are replaced with
>
> That commit is pushed, but as you can see, it only changes the rst file.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/sympy/sympy/pull/1854/files#r3310884>
> .
>