Actually it does rewrite history by default AFAIK. This is how the merges work from the end user perspective. I've never had trouble reverting a merge in any o

Actually it does rewrite history by default AFAIK. This is how the merges work from the end user perspective. I've never had trouble reverting a merge in any other context.