Code review comment for lp:~soren/nova/twisted-web-s3-server

Revision history for this message
Soren Hansen (soren) wrote :

Apparantly, it's intentional. It shows the merge conflicts that would appear when merging with the target branch. Kind of cool, kind of surprising :) I've merged with the trunk and pushed again. Please re-review.

« Back to merge proposal