Fixed issue #3956: Sometimes rebase contains wrong list of files