#931552 git-debrebase merge resolution