Fix `format` call index issue for Python 2.6

This is what happens when you forget to do `--no-ff` on an unsquashed merge.