Merge pull request #4048 from jacquesg/rebase-error-check rebase: check the result code of rebase_init_merge