Rename local variables, since merge() can now work with arbitrary iterables.
treeb53be01b2e9c1c90bf94b857aaf5b25e3d193b2e
-rw-r--r-- 2319 BUGS
-rw-r--r-- 12841 CHANGES
-rw-r--r-- 1034 COMMITTERS
-rw-r--r-- 2725 COPYING
-rw-r--r-- 817 HACKING
-rw-r--r-- 479 MANIFEST.in
-rw-r--r-- 1290 Makefile
-rw-r--r-- 83 README
drwxr-xr-x - contrib
-rwxr-xr-x 2466 cvs2bzr
-rw-r--r-- 25663 cvs2bzr-example.options
-rwxr-xr-x 2466 cvs2git
-rw-r--r-- 26508 cvs2git-example.options
-rwxr-xr-x 3084 cvs2hg
-rw-r--r-- 25523 cvs2hg-example.options
-rwxr-xr-x 2466 cvs2svn
-rw-r--r-- 29946 cvs2svn-example.options
drwxr-xr-x - cvs2svn_lib
drwxr-xr-x - cvs2svn_rcsparse
-rwxr-xr-x 816 dist.sh
drwxr-xr-x - doc
-rwxr-xr-x 122722 run-tests.py
-rwxr-xr-x 3098 setup.py
drwxr-xr-x - test-data
drwxr-xr-x - www