daniel@daydream:~/dev/apps/help.attr-lists-and-embedded-html$ bzr merge  lp:~dpm/help-app/test-animated-gif
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.1.                                                           
+N  edit-here/content/pages/img/                                                                                                                      
+N  edit-here/content/pages/img/settings.gif
All changes applied successfully.                                                                                                                     
daniel@daydream:~/dev/apps/help.attr-lists-and-embedded-html$