rebase--merge: fix --skip with two conflicts in a row