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 text
>>>>>>> 75a435a... commit message

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html