Rebase vs Rebase-I differences

Hi,


small bug observed in git 1.7.1: when one does `git rebase otherbranch` 
and there is a conflict, the conflict markers won't be showing the SHA 
id. In contrast to that, they do appear when using `git rebase -i 
otherbranch`.

<<<<<<<
this
=======
that

quoted

quoted

quoted

quoted

quoted

quoted

75a435a... commit message