http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4319 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Does not apply --- Comment #6 from Chris Cormack <chris@bigballofwax.co.nz> 2011-05-13 02:15:10 UTC --- git am -ius3 attachment.cgi\?id=3740 Commit Body is: -------------------------- BUG4319 Display hold link when item in transit or reserved Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: BUG4319 Display hold link when item in transit or reserved fatal: sha1 information is lacking or useless (C4/Search.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 BUG4319 Display hold link when item in transit or reserved 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". -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.