r20727: implement basic merging of replicated objects when it already exist
tree5bad1a49e1a556a1e2a7b193bb89753fb78bd7e2
-rw-r--r-- 3775 .bzrignore
-rw-r--r-- 275 BUGS.txt
-rw-r--r-- 17982 COPYING
-rw-r--r-- 11494 NEWS
-rw-r--r-- 4771 README
-rw-r--r-- 120 STATUS
-rw-r--r-- 5221 TODO
-rw-r--r-- 4652 WHATSNEW.txt
-rw-r--r-- 5347 howto.txt
drwxr-xr-x - packaging
-rw-r--r-- 30875 prog_guide.txt
drwxr-xr-x - services
drwxr-xr-x - source
-rw-r--r-- 2478 swat2.txt
drwxr-xr-x - testdata
drwxr-xr-x - testprogs
drwxr-xr-x - webapps