This is what happened when I merged this setup_qt branch into trunk:
$ bzr merge ../setup_qt M debian/changelog M setup.py All changes applied successfully.
No conflict, so I'll just merge myself for the sake of saving everyone some time. Yes, that means I'll be approving myself.
« Back to merge proposal
This is what happened when I merged this setup_qt branch into trunk:
$ bzr merge ../setup_qt
M debian/changelog
M setup.py
All changes applied successfully.
No conflict, so I'll just merge myself for the sake of saving everyone some time. Yes, that means I'll be approving myself.