On 1/10/09 10:40 AM, "John Mandereau" <john.mander...@gmail.com> 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?
>
> You might want to try
>
> rm input/new/printing-the-bar-number-for-the-first-measure.ly
>
> before applying.
Thanks for the tip, but that file doesn't exist.
sorensen2:lilypond-working Carl$ ls input/new/p*
input/new/page-label.ly
input/new/page-label.ly~
input/new/percent-repeat-count-visibility.ly
input/new/piano-template-with-centered-dynamics.ly
input/new/piano-template-with-centered-dynamics.ly~
input/new/positioning-multi--measure-rests.ly
input/new/positioning-multi--measure-rests.ly~
Carl
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
