[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] [UPDATE: merge-74] Include & style fixes for patch-
|
From: |
Bug Goo |
|
Subject: |
Re: [Gnu-arch-users] [UPDATE: merge-74] Include & style fixes for patch-17 |
|
Date: |
Thu, 30 Sep 2004 02:32:25 +0000 |
Failed to update merge-abentley-74 branch, errors follow:
Failed to replay over address@hidden/tla-merges--merge-74--0 (exit status 1): *
patching for revision address@hidden/tlasrc--devel--0.2--patch-19
A
{arch}/tlasrc/tlasrc--devel/tlasrc--devel--0.2/address@hidden/patch-log/patch-19
M libarch/cmdutils.c
C libarch/cmdutils.h
replay: conflicts occured during replay
On Thu Sep 30 02:32:20 2004, address@hidden wrote:
> Revision: address@hidden/tlasrc--devel--0.2--patch-19