# Merging state is tested with the multiple porcelain merge conflicts already
skip