mario@mario:~/shutter/shutter$ bzr merge ../Bug342628
M bin/shutter
M share/shutter/resources/modules/Shutter/Screenshot/SelectorAdvanced.pm
Text conflict in share/shutter/resources/modules/Shutter/Screenshot/SelectorAdvanced.pm
1 conflicts encountered.
mario@mario: ~/shutter/ shutter$ bzr merge ../Bug342628 resources/ modules/ Shutter/ Screenshot/ SelectorAdvance d.pm resources/ modules/ Shutter/ Screenshot/ SelectorAdvance d.pm
M bin/shutter
M share/shutter/
Text conflict in share/shutter/
1 conflicts encountered.