http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6413
--- Comment #28 from Paul Poulain <[email protected]> --- (In reply to comment #13) > Did you remember to try applying it with a 3 way merge > > git bz is cool, but without the patch from paul, it doesnt try to merge. Just as a reminder, the patch is here: https://depot.biblibre.com/ppoulain/0001-Add-3-parameter-to-git-am.patch (otherwise, checking this patch again, to see if I was wrong refusing QA, or arguing a little bit more to justify) -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
