Fixed issue #1486: Rebase/Cherry-pick Dialog conflict list fail to refresh the status...