evolve: move if-else block under the right block the index related if-else should be only executed when all three base, divergent and other have different branch names. I coded this last night and mistakenly mis-indented it. Caught when I was adding more tests.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t