Fixed issue #2785: Rebase/Cherry-pick with conflict in renamed file fails