Rename local variables, since merge() can now work with arbitrary iterables.
commit8e02f11afd9b41dcc992565b90fb7b2d2ff8018c
authormhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Sat, 28 Nov 2009 10:19:52 +0000 (28 10:19 +0000)
committermhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Sat, 28 Nov 2009 10:19:52 +0000 (28 10:19 +0000)
treeb53be01b2e9c1c90bf94b857aaf5b25e3d193b2e
parent32f27a4d63fde63f571122cc0862b5611f5d45f1
Rename local variables, since merge() can now work with arbitrary iterables.

git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@4980 be7e6eca-30d4-0310-a8e5-ac0d63af7087
cvs2svn_lib/sort.py