All pastes #2068671 Raw Edit

Someone

public text v1 · immutable
#2068671 ·published 2011-05-24 22:00 UTC
rendered paste body
$ git am 0001-A-worley-noise-abyss.patch
Applying: A worley-noise abyss
c:/crawl/gitorious/crawl/.git/rebase-apply/patch:83: trailing whitespace.
        int chance = pow(0.98, dist) * scalar;
c:/crawl/gitorious/crawl/.git/rebase-apply/patch:88: trailing whitespace.
            else
c:/crawl/gitorious/crawl/.git/rebase-apply/patch:94: trailing whitespace.

c:/crawl/gitorious/crawl/.git/rebase-apply/patch:129: trailing whitespace.
        else
c:/crawl/gitorious/crawl/.git/rebase-apply/patch:158: trailing whitespace.

error: crawl-ref/source/abyss.cc: does not match index
error: crawl-ref/source/abyss.h: does not match index
error: crawl-ref/source/cellular.cc: already exists in working directory
error: crawl-ref/source/cellular.h: already exists in working directory
error: crawl-ref/source/dungeon.cc: does not match index
error: crawl-ref/source/effects.cc: does not match index
error: crawl-ref/source/makefile.obj: does not match index
Patch failed at 0001 A worley-noise abyss
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".