In message <[EMAIL PROTECTED]> you wrote: > Hello Wolfgang, > > I've found this merge-merge-error. > > best regards > Sascha Laue > > From: Sascha Laue <[EMAIL PROTECTED]> > Date: Wed, 30 Apr 2008 12:27:21 +0200 > Subject: [PATCH] fix manual merge error in lwmon5 posttest. > > Signed-off-by: Sascha Laue <[EMAIL PROTECTED]> > --- > post/board/lwmon5/sysmon.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-)
Applied, manually - your patch is white-space corrupted and does not apply: Applying lwmon5: fix manual merge error in POST error: patch failed: post/board/lwmon5/sysmon.c:132 error: post/board/lwmon5/sysmon.c: patch does not apply Using index info to reconstruct a base tree... error: patch failed: post/board/lwmon5/sysmon.c:132 error: post/board/lwmon5/sysmon.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] The human mind treats a new idea the way the body treats a strange protein - it rejects it. - P. Medawar ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
