Re: Git patch won't apply

[Carl D. Sorensen]

On 1/10/09 10:54 AM, "John Mandereau" <address@hidden> wrote:

>>> Carl D. Sorensen a écrit :
>>>> fatal: git apply: bad git-diff - expected /dev/null on line 46
>>>> Patch failed at 0001.
>>>> When you have resolved this problem run "git am --resolved".
>>>> If you would prefer to skip this patch, instead run "git am --skip".
>>>> To restore the original branch and stop patching run "git am --abort".
>>>> 
>>>> Any other ideas?
> 
> Are "diff --git a/... b/..." lines broken in the patch you actually tried to
> apply?  They should not be broken, I guess.

No, they're not broken.  It's one line.

Carl