Code review comment for lp:~jamiebennett/casper/debconf-speedup-work
Revision history for this message
| James Westby (james-w) wrote | # |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
f33e652
(Get the code!)
On Wed, 03 Feb 2010 23:38:26 -0000, Colin Watson <email address hidden> wrote:
> Review: Needs Fixing
> You have two sets of merge conflicts in here (I'm surprised bzr let you commit those without some effort, actually). Could you please resolve them?
The diff it is showing is the diff that would result if you did the
merge, so are the conflicts just conflicts between this branch and the
target?
Thanks,
James