Accepted initrd-tools 0.1.74ubuntu2 (source)
mdz at canonical.com
Fri Oct 29 03:41:09 CDT 2004
On Fri, Oct 29, 2004 at 09:33:38AM +0100, Scott James Remnant wrote:
> On Thu, 2004-10-28 at 23:05 +0100, Matt Zimmerman wrote:
> > initrd-tools (0.1.74ubuntu2) hoary; urgency=low
> > .
> > * Resolve merge conflict (whitespace differences only, revert to Debian's
> > version)
> If we can revert completely to Debian, it's better just to tell elmo
> than do an upload with an empty debian->hoary diff -- that way he can do
> his syncs automatically.
That was only how I resolved the one hunk which produced a conflict; the
others were merged automatically. That is, the debian->hoary diff was very
much not empty.
More information about the ubuntu-devel