http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7844 --- Comment #27 from Dobrica Pavlinusic <dpavlin@rot13.org> --- Strange. Did you start from clean master? In my tests it does trigger 3-way merge, but it does succeed... dpavlin@koha-dev:/srv/koha(bug_7844) $ git bz apply 7844 Bug 7844 - plack scripts for developers 26148 - Bug 7844 - [SIGNED-OFF] plack intranet tooling for developers 26201 - Bug 7844 - plack should redirect / to correct page Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 7844 - [SIGNED-OFF] plack intranet tooling for developers Applying: Bug 7844 - plack should redirect / to correct page Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging misc/plack/koha.psgi -- You are receiving this mail because: You are watching all bug changes.