/srv/irclogs.ubuntu.com/2013/11/29/#bzr.txt

=== SamB_ is now known as SamB
=== joako_ is now known as joako
Wiz_KeeDhey guys, i need some help with a merge, my scenario is exactly like this guy: http://stackoverflow.com/questions/6581330/how-to-properly-merge-two-bzr-branches10:47
Wiz_KeeDBut I would like to see all the differences between the files10:47
Wiz_KeeDCan someone tell me how bzr merge works?10:59

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!