No title Revision 396134663037 (Mon Jan 30 2012 at 09:27) - Diff Link to this snippet: https://friendpaste.com/2TAVKpXwcJV3PdPlrlEOBn Embed: manni perldoc borland colorful default murphy trac fruity autumn bw emacs pastie friendly Show line numbers Wrap lines 123456thibaut@thibaut-VirtualBox:~/OpenERP 6/OpenAssur/addons-opas$ bzr pushUsing 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 mergeMerging from remembered submit location /home/thibaut/OpenERP 6/OpenAssur/addons-opas/Nothing to do.