When merging, check the IDs are unique
commit7e7c12c108a077786c48a567e71cb401f4ba5155
authorThomas Leonard <talex5@gmail.com>
Fri, 8 Mar 2013 09:31:04 +0000 (8 09:31 +0000)
committerThomas Leonard <talex5@gmail.com>
Fri, 8 Mar 2013 09:31:04 +0000 (8 09:31 +0000)
tree2f55db8c607e77363cc67e958fdcf439aba74a84
parenta9fe1960f3c2db77bf566b653b673c4dff90ddb2
When merging, check the IDs are unique

Avoids merging the same implementation twice.
merge.py
tests/testlocal.py