--- Revision None
+++ Revision 396134663037
@@ -0,0 +1,6 @@
+thibaut@thibaut-VirtualBox:~/OpenERP 6/OpenAssur/addons-opas$ bzr push
+Using saved push location: sftp://logica/home/opas52/openobject-addons-opas/
+bzr: ERROR: These branches have diverged.  See "bzr help diverged-branches" for more information.                                                                                                                                            
+thibaut@thibaut-VirtualBox:~/OpenERP 6/OpenAssur/addons-opas$ bzr merge
+Merging from remembered submit location /home/thibaut/OpenERP 6/OpenAssur/addons-opas/
+Nothing to do.